Skip to content

Commit 9862dfe

Browse files
limpoxelimpoxe
committed
Update supportV4
1 parent bd6fc49 commit 9862dfe

File tree

10 files changed

+18
-9
lines changed

10 files changed

+18
-9
lines changed

‎PluginCore/PluginCore.iml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,5 @@
8686
</content>
8787
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
8888
<orderEntry type="sourceFolder" forTests="false" />
89-
<orderEntry type="library" exported="" name="android-support-v4" level="project" />
9089
</component>
9190
</module>

‎PluginHelloWorld/PluginHelloWorld.iml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,7 @@
9090
</content>
9191
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
9292
<orderEntry type="sourceFolder" forTests="false" />
93+
<orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
94+
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
9395
</component>
9496
</module>

‎PluginHelloWorld/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ android {
2020
}
2121

2222
dependencies {
23-
//compile 'com.android.support:support-v4:23.0.0'
24-
//compile 'com.android.support:appcompat-v7:23.0.0'
23+
compile 'com.android.support:support-v4:22.1.1'
24+
//compile 'com.android.support:appcompat-v7:22.1.1'
2525
compile fileTree(dir: 'libs', include: ['*.jar'])
2626
}

‎PluginHelloWorld/libs/android-support-v4.jar

-972 KB
Binary file not shown.

‎PluginMain/PluginMain.iml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
</content>
8686
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
8787
<orderEntry type="sourceFolder" forTests="false" />
88+
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
8889
<orderEntry type="module" module-name="PluginShareLib" exported="" />
8990
<orderEntry type="module" module-name="PluginCore" exported="" />
9091
</component>

‎PluginShareLib/PluginShareLib.iml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
6868
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
6969
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars" />
7071
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7172
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
7273
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -86,6 +87,7 @@
8687
</content>
8788
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
8889
<orderEntry type="sourceFolder" forTests="false" />
89-
<orderEntry type="library" exported="" name="android-support-v4" level="project" />
90+
<orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
91+
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
9092
</component>
9193
</module>

‎PluginShareLib/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ android {
4848
}
4949

5050
dependencies {
51-
//compile 'com.android.support:support-v4:23.0.0'
52-
//compile 'com.android.support:appcompat-v7:23.0.0'
51+
compile 'com.android.support:support-v4:22.1.1'
52+
//compile 'com.android.support:appcompat-v7:22.1.1'
5353
compile fileTree(dir: 'libs', include: ['*.jar'])
5454
}
5555

‎PluginShareLib/libs/android-support-v4.jar

-972 KB
Binary file not shown.

‎PluginTest/PluginTest.iml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,10 @@
8585
</content>
8686
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
8787
<orderEntry type="sourceFolder" forTests="false" />
88-
<orderEntry type="library" exported="" name="android-support-v4" level="project" />
8988
<orderEntry type="library" exported="" name="classes" level="project" />
9089
<orderEntry type="library" exported="" name="1_classes" level="project" />
90+
<orderEntry type="library" exported="" name="2_classes" level="project" />
91+
<orderEntry type="library" exported="" name="internal_impl-22.1.1" level="project" />
9192
<orderEntry type="library" exported="" name="rClasses" level="project" />
9293
</component>
9394
</module>

‎PluginTest/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,12 @@ dependencies {
7676
provided files(project(':PluginShareLib').getBuildDir().absolutePath + '/outputs/rClasses.jar')
7777
//依赖库的src
7878
provided files(project(':PluginShareLib').getBuildDir().absolutePath + '/intermediates/bundles/release/classes.jar')
79-
//依赖库的依赖裤
80-
provided files(project(':PluginShareLib').getBuildDir().absolutePath + '/intermediates/bundles/release/libs/android-support-v4.jar')
79+
//依赖库的依赖裤（当supportV4在依赖库V的libs目录下时）
80+
//provided files(project(':PluginShareLib').getBuildDir().absolutePath + '/intermediates/bundles/release/libs/android-support-v4.jar')
81+
//依赖库的依赖裤（当supportV4通过仓库依赖时）
82+
provided files(project(':PluginShareLib').getBuildDir().absolutePath + '/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars/classes.jar')
83+
provided files(project(':PluginShareLib').getBuildDir().absolutePath + '/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars/libs/internal_impl-22.1.1.jar')
84+
8185

8286
//如果插件需要依赖一些私有库，可放开下面的注释，并修改为私有库的名称
8387
//compile project(':PluginPrivateLib1')

0 commit comments

Comments
 (0)