Skip to content

Commit 4182af0

Browse files
Lucem Anbattenzione
Lucem Anb
authored and
attenzione
committed
Build update to android pie - API 28 (#45)
1 parent ca76508 commit 4182af0

17 files changed

+227
-51
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
/.idea/libraries
88
.DS_Store
99
/build
10+
/Sample/build
11+
/ColorPickerPreference/build

‎.project‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>android-ColorPickerPreference</name>
4+
<comment>Project android-ColorPickerPreference created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
16+
</natures>
17+
</projectDescription>

‎.settings/org.eclipse.buildship.core.prefs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=
2+
eclipse.preferences.version=1

‎ColorPickerPreference/.classpath‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="output" path="bin/default"/>
6+
</classpath>

‎ColorPickerPreference/.project‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>ColorPickerPreference</name>
4+
<comment>Project ColorPickerPreference created by Buildship.</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
22+
</natures>
23+
</projectDescription>

‎ColorPickerPreference/.settings/org.eclipse.buildship.core.prefs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=..
2+
eclipse.preferences.version=1

‎ColorPickerPreference/ColorPickerPreference.iml‎

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":ColorPickerPreference" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MonthCalendarWidget....android-ColorPickerPreference" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":ColorPickerPreference" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -20,94 +19,86 @@
2019
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
2120
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
2221
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
23-
<option name="LIBRARY_PROJECT" value="true" />
22+
<option name="PROJECT_TYPE" value="1" />
2423
</configuration>
2524
</facet>
2625
</component>
27-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
26+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
2827
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2928
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3029
<exclude-output />
3130
<content url="file://$MODULE_DIR$">
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
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" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3837
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4242
<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" />
4443
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4544
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4949
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
5050
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5251
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5352
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5453
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5554
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5655
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5756
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5857
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
59-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
6058
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
6159
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
6267
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6368
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6469
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6570
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6671
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6872
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6973
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
7074
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7175
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7276
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7377
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7478
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7679
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7780
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7881
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7982
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8083
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8184
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8285
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
83-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8486
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8587
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9190
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9591
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
9695
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9796
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
9997
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
10298
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
10599
</content>
106-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
100+
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
107101
<orderEntry type="sourceFolder" forTests="false" />
108-
</component>
109-
<component name="sonarModuleSettings">
110-
<option name="localAnalysisScripName" value="&lt;PROJECT&gt;" />
111-
<option name="serverName" value="&lt;PROJECT&gt;" />
102+
<orderEntry type="library" name="Gradle: android-android-28" level="project" />
112103
</component>
113104
</module>

‎ColorPickerPreference/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ ext {
2525
}
2626

2727
android {
28-
compileSdkVersion 21
29-
buildToolsVersion "21.1.2"
28+
compileSdkVersion 28
3029

3130
defaultConfig {
3231
minSdkVersion 7
33-
targetSdkVersion 21
32+
targetSdkVersion 28
3433
versionCode 1
3534
versionName "1.0"
3635
}
@@ -43,7 +42,7 @@ android {
4342
}
4443

4544
dependencies {
46-
compile fileTree(dir: 'libs', include: ['*.jar'])
45+
implementation fileTree(dir: 'libs', include: ['*.jar'])
4746
}
4847

4948
// Place it at the end of the file

‎README.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Through Gradle
3030
You can now install this through Gradle with a simple:
3131
::
3232

33-
compile 'net.margaritov.preference.colorpicker.ColorPickerPreference:ColorPickerPreference:1.0.0'
33+
implementation 'net.margaritov.preference.colorpicker.ColorPickerPreference:ColorPickerPreference:1.0.0'
3434

3535
Android Studio
3636
--------------
@@ -46,9 +46,9 @@ Android Studio
4646
::
4747

4848
dependencies {
49-
compile fileTree(dir: 'libs', include: ['*.jar'])
50-
compile 'com.android.support:appcompat-v7:21.0.3'
51-
compile project(":ColorPickerPreference")
49+
implementation fileTree(dir: 'libs', include: ['*.jar'])
50+
implementation 'com.android.support:appcompat-v7:21.0.3'
51+
implementation project(":ColorPickerPreference")
5252
}
5353

5454

‎Sample/.classpath‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="output" path="bin/default"/>
6+
</classpath>

0 commit comments

Comments
 (0)