Skip to content

Commit 58f1f66

Browse files
taltstidltaltstidl
committed
Update support library to 24.2.1
1 parent 70a702d commit 58f1f66

File tree

9 files changed

+3628
-44
lines changed

9 files changed

+3628
-44
lines changed

‎.idea/gradle.xml‎

Lines changed: 3 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3940
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4041
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4143
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4244
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4345
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -64,14 +66,6 @@
6466
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6567
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6668
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7569
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7670
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7771
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -80,12 +74,20 @@
8074
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8175
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8276
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8385
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8486
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8587
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8688
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8789
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/24.1.1/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/24.2.1/jars" />
8991
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9092
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
9193
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
@@ -102,9 +104,20 @@
102104
</content>
103105
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
104106
<orderEntry type="sourceFolder" forTests="false" />
105-
<orderEntry type="library" exported="" name="cardview-v7-24.1.1" level="project" />
106-
<orderEntry type="library" exported="" name="support-annotations-24.1.1" level="project" />
107+
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
108+
<orderEntry type="library" exported="" name="cardview-v7-24.2.1" level="project" />
107109
<orderEntry type="module" module-name="appcompat-extension" exported="" />
108110
<orderEntry type="library" exported="" name="android-android-24" level="project" />
111+
<orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
112+
<orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
113+
<orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
114+
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
115+
<orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
116+
<orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
117+
<orderEntry type="library" exported="" name="recyclerview-v7-24.2.1" level="project" />
118+
<orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
119+
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
120+
<orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
121+
<orderEntry type="library" exported="" name="design-24.2.1" level="project" />
109122
</component>
110123
</module>

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ android {
77
defaultConfig {
88
vectorDrawables.useSupportLibrary = true
99
applicationId "com.tr4android.appcompatextension"
10-
minSdkVersion 7
10+
minSdkVersion 9
1111
targetSdkVersion 24
1212
versionCode 1
1313
versionName "1.0"
@@ -23,5 +23,5 @@ android {
2323
dependencies {
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
2525
compile project(':appcompat-extension')
26-
compile 'com.android.support:cardview-v7:24.1.1'
26+
compile 'com.android.support:cardview-v7:24.2.1'
2727
}

‎appcompat-extension/appcompat-extension.iml‎

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3940
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4041
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4142
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4244
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4345
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4446
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -65,14 +67,6 @@
6567
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6668
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6769
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7670
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7771
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7872
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -81,33 +75,59 @@
8175
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8276
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8377
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8486
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8587
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8688
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8789
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8890
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8991
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/24.2.1/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/24.2.1/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
90103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
91104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
92105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
93106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
94108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
95109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
96110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
97111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
98112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
113+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
99114
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
100115
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
101116
</content>
102117
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
103118
<orderEntry type="sourceFolder" forTests="false" />
104-
<orderEntry type="library" exported="" name="recyclerview-v7-24.1.1" level="project" />
105-
<orderEntry type="library" exported="" name="animated-vector-drawable-24.1.1" level="project" />
106-
<orderEntry type="library" exported="" name="support-vector-drawable-24.1.1" level="project" />
107-
<orderEntry type="library" exported="" name="support-v4-24.1.1" level="project" />
108-
<orderEntry type="library" exported="" name="appcompat-v7-24.1.1" level="project" />
109-
<orderEntry type="library" exported="" name="design-24.1.1" level="project" />
110-
<orderEntry type="library" exported="" name="support-annotations-24.1.1" level="project" />
119+
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
120+
<orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
121+
<orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
122+
<orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
123+
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
124+
<orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
125+
<orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
126+
<orderEntry type="library" exported="" name="recyclerview-v7-24.2.1" level="project" />
127+
<orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
128+
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
129+
<orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
130+
<orderEntry type="library" exported="" name="design-24.2.1" level="project" />
111131
<orderEntry type="library" exported="" name="android-android-24" level="project" />
112132
</component>
113133
</module>

‎appcompat-extension/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99

1010
defaultConfig {
1111
vectorDrawables.useSupportLibrary = true
12-
minSdkVersion 7
12+
minSdkVersion 9
1313
targetSdkVersion 24
1414
versionCode 1
1515
versionName "1.0"
@@ -24,5 +24,5 @@ android {
2424

2525
dependencies {
2626
compile fileTree(dir: 'libs', include: ['*.jar'])
27-
compile 'com.android.support:design:24.1.1'
27+
compile 'com.android.support:design:24.2.1'
2828
}

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.2'
9-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
8+
classpath 'com.android.tools.build:gradle:2.2.0'
9+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1010

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

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Mar 04 10:34:25 CET 2016
1+
#Thu Oct 06 17:52:34 CEST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 commit comments

Comments
 (0)