android maven plugin update

This commit is contained in:
serso 2015-01-19 21:17:58 +01:00
parent ee2d2c9608
commit 95b2afe306
469 changed files with 2219 additions and 2273 deletions

View File

@ -5,10 +5,10 @@
<configuration>
<option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/android-app-core/target/generated-sources/r" />
<option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/android-app-core/target/generated-sources/aidl" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/android-app-core/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/android-app-core/res" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/android-app-core/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/android-app-core/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/android-app-core/assets" />
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app-core/libs" />
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/android-app-core/src/main/libs" />
<option name="CUSTOM_APK_RESOURCE_FOLDER" value="/android-app-core/target/generated-sources/combined-resources/res" />
<option name="APK_PATH" value="/android-app-core/target/android-app-core.apk" />
<option name="LIBRARY_PROJECT" value="true" />
@ -22,12 +22,13 @@
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/android-app-core/target/idea-classes" />
<output-test url="file://$MODULE_DIR$/android-app-core/target/idea-test-classes" />
<output url="file://$MODULE_DIR$/android-app-core/target/classes" />
<output-test url="file://$MODULE_DIR$/android-app-core/target/test-classes" />
<content url="file://$MODULE_DIR$/android-app-core">
<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/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-assets" isTestSource="false" generated="true" />
<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-instrumented" />
@ -39,9 +40,30 @@
<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/unpack" />
<excludeFolder url="file://$MODULE_DIR$/android-app-core/target/unpacked-libs" />
</content>
<orderEntry type="jdk" jdkName="Maven Android API 17 Platform (2)" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
<orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
<orderEntry type="module" module-name="core" />
<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" />
@ -104,26 +126,6 @@
<orderEntry type="library" scope="TEST" name="Maven: nekohtml:xercesMinimal:1.9.6.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-6" level="project" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
<orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
<orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
</component>
<component name="org.twodividedbyzero.idea.findbugs">
<option name="_basePreferences">

View File

@ -76,7 +76,7 @@
<extensions>
<extension>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<groupId>com.simpligility.maven.plugins</groupId>
<artifactId>android-maven-plugin</artifactId>
</extension>
</extensions>

View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<!--should be implemented-->
</LinearLayout>

View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<!--should be implemented-->
</LinearLayout>

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 296 B

After

Width:  |  Height:  |  Size: 296 B

View File

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 420 B

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 716 B

After

Width:  |  Height:  |  Size: 716 B

View File

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 238 B

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 515 B

After

Width:  |  Height:  |  Size: 515 B

View File

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 576 B

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 424 B

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 593 B

After

Width:  |  Height:  |  Size: 593 B

View File

Before

Width:  |  Height:  |  Size: 601 B

After

Width:  |  Height:  |  Size: 601 B

View File

Before

Width:  |  Height:  |  Size: 896 B

After

Width:  |  Height:  |  Size: 896 B

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 942 B

After

Width:  |  Height:  |  Size: 942 B

View File

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

Before

Width:  |  Height:  |  Size: 870 B

After

Width:  |  Height:  |  Size: 870 B

View File

Before

Width:  |  Height:  |  Size: 270 B

After

Width:  |  Height:  |  Size: 270 B

View File

Before

Width:  |  Height:  |  Size: 324 B

After

Width:  |  Height:  |  Size: 324 B

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 670 B

After

Width:  |  Height:  |  Size: 670 B

View File

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 424 B

View File

Before

Width:  |  Height:  |  Size: 520 B

After

Width:  |  Height:  |  Size: 520 B

View File

Before

Width:  |  Height:  |  Size: 860 B

After

Width:  |  Height:  |  Size: 860 B

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 361 B

View File

Before

Width:  |  Height:  |  Size: 668 B

After

Width:  |  Height:  |  Size: 668 B

View File

Before

Width:  |  Height:  |  Size: 899 B

After

Width:  |  Height:  |  Size: 899 B

View File

Before

Width:  |  Height:  |  Size: 511 B

After

Width:  |  Height:  |  Size: 511 B

View File

Before

Width:  |  Height:  |  Size: 532 B

After

Width:  |  Height:  |  Size: 532 B

View File

Before

Width:  |  Height:  |  Size: 610 B

After

Width:  |  Height:  |  Size: 610 B

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 236 B

View File

Before

Width:  |  Height:  |  Size: 510 B

After

Width:  |  Height:  |  Size: 510 B

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 751 B

After

Width:  |  Height:  |  Size: 751 B

View File

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 238 B

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 489 B

After

Width:  |  Height:  |  Size: 489 B

View File

Before

Width:  |  Height:  |  Size: 454 B

After

Width:  |  Height:  |  Size: 454 B

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

Before

Width:  |  Height:  |  Size: 357 B

After

Width:  |  Height:  |  Size: 357 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 544 B

After

Width:  |  Height:  |  Size: 544 B

View File

Before

Width:  |  Height:  |  Size: 461 B

After

Width:  |  Height:  |  Size: 461 B

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Some files were not shown because too many files have changed in this diff Show More