Skip to content

Commit c9188fa

Browse files
jdeejdee
committed
Reduced Gradle version to 2.2.+ in testbed apps to allow use of buildToolsVersion 23.0.1
1 parent 11f8566 commit c9188fa

File tree

7 files changed

+65
-19
lines changed

7 files changed

+65
-19
lines changed

‎testbed/testbed_carthage/android/app/app.iml‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,30 +62,42 @@
6262
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7871
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fbui.textlayoutbuilder/textlayoutbuilder/1.0.0/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.11.0/jars" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.11.0/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.11.0/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.11.0/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp3/0.11.0/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.11.0/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.42.0/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.soloader/soloader/0.1.0/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
8195
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
8396
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8497
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8598
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8699
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
87100
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
89101
</content>
90102
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
91103
<orderEntry type="sourceFolder" forTests="false" />
@@ -109,13 +121,14 @@
109121
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
110122
<orderEntry type="library" exported="" name="imagepipeline-base-0.11.0" level="project" />
111123
<orderEntry type="library" exported="" name="soloader-0.1.0" level="project" />
112-
<orderEntry type="library" exported="" name="answers-shim-0.0.6" level="project" />
113124
<orderEntry type="library" exported="" name="javax.inject-1" level="project" />
114125
<orderEntry type="library" exported="" name="okhttp-ws-3.4.1" level="project" />
115126
<orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" />
116-
<orderEntry type="library" exported="" name="library-2.5.9" level="project" />
117127
<orderEntry type="library" exported="" name="imagepipeline-okhttp3-0.11.0" level="project" />
118128
<orderEntry type="library" exported="" name="react-native-0.42.0" level="project" />
119129
<orderEntry type="module" module-name="react-native-branch" exported="" />
130+
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
131+
<orderEntry type="library" exported="" name="answers-shim-0.0.6" level="project" />
132+
<orderEntry type="library" exported="" name="library-2.5.9" level="project" />
120133
</component>
121134
</module>

‎testbed/testbed_carthage/android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def enableProguardInReleaseBuilds = false
8484

8585
android {
8686
compileSdkVersion 23
87-
buildToolsVersion '25.0.0'
87+
buildToolsVersion '23.0.1'
8888

8989
defaultConfig {
9090
applicationId "com.testbed_carthage"

‎testbed/testbed_carthage/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.0'
8+
classpath 'com.android.tools.build:gradle:2.2.+'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎testbed/testbed_carthage/android/testbed_carthage.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
16+
<orderEntry type="inheritedJdk" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎testbed/testbed_cocoapods/android/app/app.iml‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,21 @@
7777
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7878
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fbui.textlayoutbuilder/textlayoutbuilder/1.0.0/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/drawee/0.11.0/jars" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fbcore/0.11.0/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/fresco/0.11.0/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.11.0/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp3/0.11.0/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.11.0/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.42.0/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.soloader/soloader/0.1.0/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
8095
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8196
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8297
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
@@ -106,13 +121,31 @@
106121
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
107122
<orderEntry type="library" exported="" name="imagepipeline-base-0.11.0" level="project" />
108123
<orderEntry type="library" exported="" name="soloader-0.1.0" level="project" />
109-
<orderEntry type="library" exported="" name="answers-shim-0.0.6" level="project" />
110124
<orderEntry type="library" exported="" name="javax.inject-1" level="project" />
111125
<orderEntry type="library" exported="" name="okhttp-ws-3.4.1" level="project" />
112126
<orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" />
113-
<orderEntry type="library" exported="" name="library-2.5.9" level="project" />
114127
<orderEntry type="library" exported="" name="imagepipeline-okhttp3-0.11.0" level="project" />
115128
<orderEntry type="library" exported="" name="react-native-0.42.0" level="project" />
116129
<orderEntry type="module" module-name="react-native-branch" exported="" />
130+
<orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
131+
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
132+
<orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
133+
<orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
134+
<orderEntry type="library" exported="" name="answers-shim-0.0.6" level="project" />
135+
<orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
136+
<orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
137+
<orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
138+
<orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
139+
<orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
140+
<orderEntry type="library" exported="" name="imagepipeline-0.8.1" level="project" />
141+
<orderEntry type="library" exported="" name="fresco-0.8.1" level="project" />
142+
<orderEntry type="library" exported="" name="imagepipeline-okhttp-0.8.1" level="project" />
143+
<orderEntry type="library" exported="" name="library-2.5.9" level="project" />
144+
<orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
145+
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
146+
<orderEntry type="library" exported="" name="drawee-0.8.1" level="project" />
147+
<orderEntry type="library" exported="" name="react-native-0.20.1" level="project" />
148+
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
149+
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
117150
</component>
118151
</module>

‎testbed/testbed_cocoapods/android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def enableProguardInReleaseBuilds = false
7878

7979
android {
8080
compileSdkVersion 23
81-
buildToolsVersion '25.0.0'
81+
buildToolsVersion '23.0.1'
8282

8383
defaultConfig {
8484
applicationId "com.testbed_cocoapods"

‎testbed/testbed_cocoapods/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.0'
8+
classpath 'com.android.tools.build:gradle:2.2.+'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

0 commit comments

Comments
 (0)