From 868d0a218e9598f19d15f47d25a203cbf8a96578 Mon Sep 17 00:00:00 2001 From: serso Date: Mon, 4 Jan 2016 12:09:31 +0100 Subject: [PATCH] AS files removed from git --- .gitignore | 6 +- .idea/.name | 1 - .idea/androidDexCompiler.xml | 6 - .idea/codeStyleSettings.xml | 247 ----------------- .idea/compiler.xml | 23 -- .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 7 - .idea/gradle.xml | 22 -- .idea/misc.xml | 59 ---- .idea/modules.xml | 12 - .idea/runConfigurations.xml | 12 - .idea/runConfigurations/Run.xml | 23 -- .idea/runConfigurations/Tests.xml | 25 -- .idea/scopes/scope_settings.xml | 5 - .idea/vcs.xml | 8 - android-app-tests/android-app-tests.iml | 116 -------- android-app/android-app.iml | 141 ---------- calculatorpp.iml | 19 -- pom.xml | 342 ------------------------ 19 files changed, 2 insertions(+), 1075 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/androidDexCompiler.xml delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/runConfigurations.xml delete mode 100644 .idea/runConfigurations/Run.xml delete mode 100644 .idea/runConfigurations/Tests.xml delete mode 100644 .idea/scopes/scope_settings.xml delete mode 100644 .idea/vcs.xml delete mode 100644 android-app-tests/android-app-tests.iml delete mode 100644 android-app/android-app.iml delete mode 100644 calculatorpp.iml delete mode 100644 pom.xml diff --git a/.gitignore b/.gitignore index c8b87fb8..67243584 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,8 @@ gen-external-apklibs target atlassian-ide-plugin.xml -.idea/workspace.xml -.idea/tasks.xml -.idea/uiDesigner.xml -.idea/libraries/ +.idea +*.iml build local.properties captures diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 02d97f4f..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Calculator++ \ No newline at end of file diff --git a/.idea/androidDexCompiler.xml b/.idea/androidDexCompiler.xml deleted file mode 100644 index e5b977f2..00000000 --- a/.idea/androidDexCompiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index e2779986..00000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 217af471..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 0218f4cb..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 09687f96..00000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 89187795..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.6 - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 99134cac..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460d..00000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Run.xml b/.idea/runConfigurations/Run.xml deleted file mode 100644 index 74e3f1bb..00000000 --- a/.idea/runConfigurations/Run.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Tests.xml b/.idea/runConfigurations/Tests.xml deleted file mode 100644 index fc102088..00000000 --- a/.idea/runConfigurations/Tests.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b8..00000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 276779e8..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/android-app-tests/android-app-tests.iml b/android-app-tests/android-app-tests.iml deleted file mode 100644 index 1fc3dd4f..00000000 --- a/android-app-tests/android-app-tests.iml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android-app/android-app.iml b/android-app/android-app.iml deleted file mode 100644 index 7236d02b..00000000 --- a/android-app/android-app.iml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/calculatorpp.iml b/calculatorpp.iml deleted file mode 100644 index ee0248d1..00000000 --- a/calculatorpp.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml deleted file mode 100644 index cf3ab52d..00000000 --- a/pom.xml +++ /dev/null @@ -1,342 +0,0 @@ - - - - - - - org.sonatype.oss - oss-parent - 7 - - - 4.0.0 - - org.solovyev.android - calculatorpp-parent - pom - 2.0.7-SNAPSHOT - Calculator++ - - - scm:git:git@github.com:serso/android-calculatorpp.git - scm:git:git@github.com:serso/android-calculatorpp.git - http://github.com/serso/android-calculatorpp - release-2.0.5 - - - - - in-project-repository - In Project Repo - file://${project.basedir}/maven-repository - - - - - - in-project-repository - In Project Repo - file://${project.basedir}/maven-repository - - - - - android-app - android-app-core - android-app-widget - android-app-onscreen - android-app-test - core - - - - UTF-8 - 1.1.17 - 1.0.7 - 1.0.8 - - - - - - - org.solovyev.android - calculatorpp-core - ${project.version} - - - - org.solovyev.android - calculatorpp-android-app-core - ${project.version} - apklib - - - - org.solovyev.android - calculatorpp-android-app-widget - ${project.version} - apklib - - - - org.solovyev.android - calculatorpp-android-app-onscreen - ${project.version} - apklib - - - - org.solovyev - common-core - ${jcl.version} - - - - org.solovyev - common-text - ${jcl.version} - - - - org.solovyev - common-listeners - ${jcl.version} - - - - org.solovyev.android - android-common-all - apklib - ${acl.version} - - - - - com.actionbarsherlock - library - 4.2.0 - apklib - - - - org.solovyev - jscl - ${jscl.version} - - - xercesImpl - xerces - - - - - - junit - junit - 4.11 - - - - org.robolectric - robolectric - 2.1.1 - test - - - - com.google.android - android - 4.1.1.4 - provided - - - - com.google.android - support-v4 - r7 - - - - com.google.android - android-test - 4.1.1.4 - - - - com.google.guava - guava - 11.0.2 - - - com.google.code.findbugs - jsr305 - - - - - - org.simpleframework - simple-xml - 2.6.1 - - - stax-api - stax - - - xpp3 - xpp3 - - - - - - - - - - - - - org.solovyev.external.com.electriccloud - org.solovyev.external.javac2-maven-plugin - 1.0.4 - - - @Nonnull Instrumentation - - instrument - - - compile - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.15 - - 10 - false - - - - - org.apache.maven.plugins - maven-release-plugin - 2.3.2 - - forked-path - false - -Psonatype-oss-release -Prelease ${arguments} - release-@{project.version} - - - - - - - - - - org.apache.maven.plugins - maven-jarsigner-plugin - 1.2 - - - - com.simpligility.maven.plugins - android-maven-plugin - 4.1.0 - - - - ${project.basedir}/src/main/java - - - false - - 17 - - - - 23 - 10000 - - - - - true - - - true - - - - - - - com.pyx4me - proguard-maven-plugin - 2.0.4 - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - - - - - - - - - - standard - - - - - release - - - - performRelease - true - - - - - - - - \ No newline at end of file