TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

POM dependency versions fixed

Browse Source
This commit is contained in:
serso 2014-09-08 21:25:38 +02:00
parent 4350ef450f
commit 1c71606ac9
7 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/modules.xml
View File

@ -52,10 +52,7 @@
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" /> <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" />
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" /> <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_android-common-wizard_1.1.15.iml" />
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.2.iml" /> <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.2.iml" />
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-core_2.0.2.iml" />
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-onscreen_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-onscreen_2.0.2.iml" /> <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-onscreen_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-onscreen_2.0.2.iml" />
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-onscreen_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-onscreen_2.0.2.iml" />
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.2.iml" />
<module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.2.iml" /> <module fileurl="file://$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.2.iml" filepath="$PROJECT_DIR$/android-app/gen-external-apklibs/~apklib-org.solovyev.android_calculatorpp-android-app-widget_2.0.2.iml" />
</modules> </modules>
</component> </component>

4
android-app-core.iml
View File

@ -28,13 +28,11 @@
<sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/r" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/r" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/aidl" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/aidl" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/android-app-core/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/android-app-core/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/apidocs" />
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes" /> <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes-instrumented" /> <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes-instrumented" />
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-assets" /> <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-assets" />
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-resources" /> <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-resources" />
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/extracted-dependencies" /> <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/extracted-dependencies" />
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/javadoc-bundle-options" />
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-archiver" /> <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-archiver" />
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-status" /> <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-status" />
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/unpack" /> <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/unpack" />
@ -47,7 +45,7 @@
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
<orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" /> <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
<orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" /> <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />

4
android-app-onscreen.iml
View File

@ -28,13 +28,11 @@
<sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/r" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/r" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/aidl" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/aidl" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/apidocs" />
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes" /> <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes-instrumented" /> <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes-instrumented" />
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-assets" /> <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-assets" />
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-resources" /> <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-resources" />
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/extracted-dependencies" /> <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/extracted-dependencies" />
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/javadoc-bundle-options" />
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-archiver" /> <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-archiver" />
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-status" /> <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-status" />
<excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/unpack" /> <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/unpack" />
@ -47,7 +45,7 @@
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
<orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" /> <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
<orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" /> <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />

4
android-app-widget.iml
View File

@ -28,13 +28,11 @@
<sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/r" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/r" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/aidl" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/aidl" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/android-app-widget/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/android-app-widget/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/apidocs" />
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes" /> <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes-instrumented" /> <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes-instrumented" />
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-assets" /> <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-assets" />
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-resources" /> <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-resources" />
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/extracted-dependencies" /> <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/extracted-dependencies" />
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/javadoc-bundle-options" />
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-archiver" /> <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-archiver" />
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-status" /> <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-status" />
<excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/unpack" /> <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/unpack" />
@ -47,7 +45,7 @@
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
<orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" /> <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
<orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" /> <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />

6
android-app.iml
View File

@ -28,17 +28,13 @@
<sourceFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/aidl" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/aidl" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/android-app/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/android-app/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/android-app/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/android-app/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/apidocs" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/classes" /> <excludeFolder url="file://$MODULE_DIR$/android-app/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/classes-instrumented" /> <excludeFolder url="file://$MODULE_DIR$/android-app/target/classes-instrumented" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-assets" /> <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-assets" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-resources" /> <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-resources" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/extracted-dependencies" /> <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/extracted-dependencies" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/gpg" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/javadoc-bundle-options" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-archiver" /> <excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-archiver" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-status" /> <excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-status" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/proguard" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/surefire-reports" /> <excludeFolder url="file://$MODULE_DIR$/android-app/target/surefire-reports" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/test-classes" /> <excludeFolder url="file://$MODULE_DIR$/android-app/target/test-classes" />
<excludeFolder url="file://$MODULE_DIR$/android-app/target/unpack" /> <excludeFolder url="file://$MODULE_DIR$/android-app/target/unpack" />
@ -51,7 +47,7 @@
<orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" /> <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
<orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" /> <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
<orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" /> <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />

2
core.iml
View File

@ -22,7 +22,7 @@
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.0" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.7" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
<orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" /> <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
<orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" /> <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
<orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" /> <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />

10
pom.xml
View File

@ -41,7 +41,7 @@
<connection>scm:git:git@github.com:serso/android-calculatorpp.git</connection> <connection>scm:git:git@github.com:serso/android-calculatorpp.git</connection>
<developerConnection>scm:git:git@github.com:serso/android-calculatorpp.git</developerConnection> <developerConnection>scm:git:git@github.com:serso/android-calculatorpp.git</developerConnection>
<url>http://github.com/serso/android-calculatorpp</url> <url>http://github.com/serso/android-calculatorpp</url>
<tag>release-2.0.1</tag> <tag>release-2.0.5</tag>
</scm> </scm>
<pluginRepositories> <pluginRepositories>
@ -82,27 +82,27 @@
<dependency> <dependency>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-core</artifactId> <artifactId>calculatorpp-core</artifactId>
<version>2.0.2</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-android-app-core</artifactId> <artifactId>calculatorpp-android-app-core</artifactId>
<version>2.0.2</version> <version>${project.version}</version>
<type>apklib</type> <type>apklib</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-android-app-widget</artifactId> <artifactId>calculatorpp-android-app-widget</artifactId>
<version>2.0.2</version> <version>${project.version}</version>
<type>apklib</type> <type>apklib</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-android-app-onscreen</artifactId> <artifactId>calculatorpp-android-app-onscreen</artifactId>
<version>2.0.2</version> <version>${project.version}</version>
<type>apklib</type> <type>apklib</type>
</dependency> </dependency>