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

Commit 4443648

Browse files
AndroidDeveloperLBAndroidDeveloperLB
committed
updated sdks
1 parent 79cd403 commit 4443648

25 files changed

+182
-186
lines changed

‎.idea/assetWizardSettings.xml

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

‎.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

‎.idea/misc.xml

Lines changed: 5 additions & 3 deletions
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
@@ -8,7 +8,7 @@
88
</configuration>
99
</facet>
1010
</component>
11-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
1212
<exclude-output />
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

‎app/app.iml

Lines changed: 49 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@
2222
</configuration>
2323
</facet>
2424
</component>
25-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
26-
<output url="file://$MODULE_DIR$/build/intermediates/artifact_transform/compileDebugJavaWithJavac/classes" />
27-
<output-test url="file://$MODULE_DIR$/build/intermediates/artifact_transform/compileDebugUnitTestJavaWithJavac/classes" />
25+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
26+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
27+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
2828
<exclude-output />
2929
<content url="file://$MODULE_DIR$">
3030
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" isTestSource="false" generated="true" />
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" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -84,42 +84,64 @@
8484
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8585
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8686
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/artifact_transform" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
9091
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
9194
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
9397
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
96101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
97103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
98104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
99106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
101108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
102109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
103110
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
104111
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
105112
</content>
106-
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
113+
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
107114
<orderEntry type="sourceFolder" forTests="false" />
108-
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
109-
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.0" level="project" />
110-
<orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
111-
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.0" level="project" />
112-
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.0" level="project" />
113-
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
114-
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.0" level="project" />
115-
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
116-
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.0" level="project" />
117-
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.0@jar" level="project" />
118-
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.0" level="project" />
119-
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
120-
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.0" level="project" />
121-
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
115+
<orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater-1.0.0-alpha3" level="project" />
116+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0-alpha1@jar" level="project" />
117+
<orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0-alpha3@jar" level="project" />
118+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime-2.0.0-alpha1" level="project" />
119+
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-1.0.0-alpha3" level="project" />
120+
<orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout-1.0.0-alpha3" level="project" />
121+
<orderEntry type="library" name="Gradle: androidx.interpolator:interpolator-1.0.0-alpha3" level="project" />
122+
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable-1.0.0-alpha3" level="project" />
123+
<orderEntry type="library" name="Gradle: androidx.documentfile:documentfile-1.0.0-alpha3" level="project" />
124+
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-1.0.0-alpha3" level="project" />
125+
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui-1.0.0-alpha3" level="project" />
126+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core-2.0.0-alpha1" level="project" />
127+
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager-1.0.0-alpha3" level="project" />
128+
<orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager-1.0.0-alpha3" level="project" />
129+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-2.0.0-alpha1" level="project" />
130+
<orderEntry type="library" name="Gradle: androidx.loader:loader-1.0.0-alpha3" level="project" />
131+
<orderEntry type="library" name="Gradle: androidx.fragment:fragment-1.0.0-alpha3" level="project" />
132+
<orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout-1.0.0-alpha3" level="project" />
133+
<orderEntry type="library" name="Gradle: androidx.customview:customview-1.0.0-alpha3" level="project" />
134+
<orderEntry type="library" name="Gradle: androidx.print:print-1.0.0-alpha3" level="project" />
135+
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter-1.0.0-alpha3" level="project" />
136+
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0-alpha1@jar" level="project" />
137+
<orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout-1.0.0-alpha3" level="project" />
138+
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated-1.0.0-alpha3" level="project" />
139+
<orderEntry type="library" name="Gradle: androidx.core:core-1.0.0-alpha3" level="project" />
140+
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils-1.0.0-alpha3" level="project" />
141+
<orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout-1.0.0-alpha3" level="project" />
142+
<orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime-2.0.0-alpha1" level="project" />
143+
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0-alpha3@jar" level="project" />
122144
<orderEntry type="module" module-name="material_preferences_library" />
123-
<orderEntry type="library" name="Gradle: android-android-27" level="project" />
145+
<orderEntry type="library" name="Gradle: android-android-28" level="project" />
124146
</component>
125147
</module>

‎app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 27
4+
compileSdkVersion 28
55

66
defaultConfig {
77
vectorDrawables.useSupportLibrary = true
88
applicationId "com.lb.material_preferences"
99
minSdkVersion 14
10-
targetSdkVersion 27
10+
targetSdkVersion 28
1111
versionCode 1
1212
versionName "1.0"
1313
vectorDrawables.useSupportLibrary = true
@@ -19,8 +19,8 @@ android {
1919
}
2020
}
2121
compileOptions {
22-
sourceCompatibility JavaVersion.VERSION_1_7
23-
targetCompatibility JavaVersion.VERSION_1_7
22+
sourceCompatibility JavaVersion.VERSION_1_8
23+
targetCompatibility JavaVersion.VERSION_1_8
2424
}
2525
repositories {
2626
jcenter()
@@ -32,7 +32,7 @@ android {
3232

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

‎build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
65
google()
6+
jcenter()
77
}
88
dependencies {
99
// https://bintray.com/android/android-tools/com.android.tools.build.gradle/view
10-
classpath 'com.android.tools.build:gradle:3.2.0-alpha06'
10+
classpath 'com.android.tools.build:gradle:3.2.0-beta01'
1111
// https://github.com/dcendents/android-maven-gradle-plugin
1212
// classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1313
// NOTE: Do not place your application dependencies here; they belong
@@ -17,7 +17,7 @@ buildscript {
1717

1818
allprojects {
1919
repositories {
20-
jcenter()
2120
google()
21+
jcenter()
2222
}
2323
}

‎gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@
1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true
18+
# org.gradle.parallel=true
19+
android.enableJetifier=true
20+
android.useAndroidX=true

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Mar 13 22:57:36 IST 2018
1+
#Sun Jun 24 01:18:21 IDT 2018
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-4.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

‎material_preferences_library/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 27
4+
compileSdkVersion 28
55

66
defaultConfig {
77
vectorDrawables.useSupportLibrary = true
88
minSdkVersion 14
9-
targetSdkVersion 27
9+
targetSdkVersion 28
1010
versionCode 1
1111
versionName "1.0"
1212
}
@@ -17,12 +17,12 @@ android {
1717
// }
1818
// }
1919
compileOptions {
20-
sourceCompatibility JavaVersion.VERSION_1_7
21-
targetCompatibility JavaVersion.VERSION_1_7
20+
sourceCompatibility JavaVersion.VERSION_1_8
21+
targetCompatibility JavaVersion.VERSION_1_8
2222
}
2323
}
2424

2525
dependencies {
2626
implementation fileTree(include: ['*.jar'], dir: 'libs')
27-
implementation 'com.android.support:appcompat-v7:27.1.0'
27+
implementation 'androidx.appcompat:appcompat:1.0.0-alpha3'
2828
}

0 commit comments

Comments
 (0)