update ext version

This commit is contained in:
丹木
2015-12-17 10:36:54 +08:00
parent 162a7896b4
commit 810ba00a51
6 changed files with 20 additions and 125 deletions
+7 -5
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":extension" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../tmallandroid" external.system.id="GRADLE" external.system.module.group="tmallandroid" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":extension" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="vlayout" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
@@ -72,6 +72,8 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/21.0.2/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -89,14 +91,14 @@
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-21.0.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
@@ -105,11 +107,11 @@
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.8.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
</component>
+1 -1
View File
@@ -20,5 +20,5 @@
GROUP=com.tmall.android
ARTIFACT=vlayout-ext
VERSION=111
VERSION_NAME=1.1.1.2
VERSION_NAME=1.1.1.3
PACKAGING_TYPE=aar
+4 -110
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":vlayout" external.linked.project.path="$MODULE_DIR$/vlayout" external.root.project.path="$MODULE_DIR$/../tmallandroid_tangram" external.system.id="GRADLE" external.system.module.group="tmallandroid_tangram" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.id="vlayout" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
@@ -7,121 +7,15 @@
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":vlayout" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<afterSyncTasks>
<task>generateDebugAndroidTestSources</task>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/vlayout/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
<option name="LIBRARY_PROJECT" value="true" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<output url="file://$MODULE_DIR$/vlayout/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/vlayout/build/intermediates/classes/androidTest/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$/vlayout">
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/res/generated/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/vlayout/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/21.0.2/jars" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/exploded-aar/com.tmall.android/vlayout-ext/1.1.1.2/jars" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/proguard" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/libs" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/poms" />
<excludeFolder url="file://$MODULE_DIR$/vlayout/build/tmp" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-21.0.2" level="project" />
<orderEntry type="library" exported="" name="vlayout-ext-1.1.1.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.8.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
</component>
</module>
+2 -2
View File
@@ -28,9 +28,9 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
//compile project(':extension')
compile project(':extension')
compile 'com.tmall.android:vlayout-ext:1.1.1.2@aar'
//compile 'com.tmall.android:vlayout-ext:1.1.1.2@aar'
compile 'com.android.support:recyclerview-v7:21.0.2@aar'
compile('com.android.support:support-v4:21.0.0@aar') {
exclude group: 'com.android.support', module: 'support-annotations'
+2 -3
View File
@@ -72,7 +72,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.tmall.android/vlayout-ext/1.1.1.2-SNAPSHOT/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -104,16 +103,16 @@
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
<orderEntry type="library" exported="" name="vlayout-ext-1.1.1.2-SNAPSHOT" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.8.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
<orderEntry type="module" module-name="extension" exported="" />
</component>
</module>
+4 -4
View File
@@ -27,7 +27,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output />
@@ -95,13 +95,13 @@
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-21.0.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
@@ -109,8 +109,8 @@
<orderEntry type="library" exported="" scope="TEST" name="junit-4.8.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
<orderEntry type="module" module-name="extension" exported="" />