Skip to content
This repository was archived by the owner on May 1, 2021. It is now read-only.

Commit 9ed912b

Browse files
AndroidDeveloperLBAndroidDeveloperLB
committed
updated sdk versions
1 parent dd8ed1e commit 9ed912b

File tree

11 files changed

+51
-62
lines changed

11 files changed

+51
-62
lines changed

‎.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.idea/gradle.xml

Lines changed: 0 additions & 7 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 & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.idea/vcs.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.

‎MaterialPreferenceLibrary.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="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎app/app.iml

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,67 +47,73 @@
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4949
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5051
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5152
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5253
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5354
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5455
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
5556
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5657
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5759
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5860
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5961
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6062
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6163
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6264
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6365
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
7167
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7268
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7369
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7470
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7571
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7672
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7773
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7883
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7984
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8085
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8186
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8287
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.2.0/jars" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.0/jars" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.0/jars" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.2.0/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
8792
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
8893
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
8994
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
9096
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
9197
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
9298
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9399
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
94100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
96101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
97102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
98103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
99105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
100106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
101107
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
102108
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
103109
</content>
104110
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
105111
<orderEntry type="sourceFolder" forTests="false" />
106-
<orderEntry type="library" exported="" name="support-v4-23.2.0" level="project" />
107-
<orderEntry type="library" exported="" name="support-annotations-23.2.0" level="project" />
108-
<orderEntry type="library" exported="" name="appcompat-v7-23.2.0" level="project" />
109-
<orderEntry type="library" exported="" name="animated-vector-drawable-23.2.0" level="project" />
110-
<orderEntry type="library" exported="" name="support-vector-drawable-23.2.0" level="project" />
112+
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
113+
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
114+
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
115+
<orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
116+
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
111117
<orderEntry type="module" module-name="material_preferences_library" exported="" />
112118
</component>
113119
</module>

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 23
5-
buildToolsVersion "23.0.2"
5+
buildToolsVersion "23.0.3"
66

77
defaultConfig {
88
vectorDrawables.useSupportLibrary = true
@@ -32,7 +32,7 @@ android {
3232

3333
dependencies {
3434
compile fileTree(include: ['*.jar'], dir: 'libs')
35-
compile 'com.android.support:appcompat-v7:23.2.0'
35+
compile 'com.android.support:appcompat-v7:23.4.0'
3636
compile project(':material_preferences_library')
3737
// compile 'com.github.AndroidDeveloperLB:MaterialPreferenceLibrary:7'
3838

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
}
77
dependencies {
88
// https://bintray.com/android/android-tools/com.android.tools.build.gradle/view
9-
classpath 'com.android.tools.build:gradle:2.0.0-beta6'
9+
classpath 'com.android.tools.build:gradle:2.1.2'
1010
// https://github.com/dcendents/android-maven-gradle-plugin
11-
classpath 'com.github.dcendents:android-maven-plugin:1.2'
11+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
1414
}

‎material_preferences_library/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22

33
android {
44
compileSdkVersion 23
5-
buildToolsVersion "23.0.2"
5+
buildToolsVersion "23.0.3"
66

77
defaultConfig {
88
vectorDrawables.useSupportLibrary = true
@@ -25,5 +25,5 @@ android {
2525

2626
dependencies {
2727
compile fileTree(include: ['*.jar'], dir: 'libs')
28-
compile 'com.android.support:appcompat-v7:23.2.0'
28+
compile 'com.android.support:appcompat-v7:23.4.0'
2929
}

0 commit comments

Comments
 (0)