Merge pull request #120 from side-codes/develop

Release v0.5.0
side-codes · Nov 8, 2020 · 3686760 · 3686760
2 parents 28d9d2d + b09523b
commit 3686760
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@
 Gradle dependency:
 
 ```gradle
-implementation "codes.side:andcolorpicker:0.4.0"
+implementation "codes.side:andcolorpicker:0.5.0"
 ```
 
 ## :art: Picker types

diff --git a/andcolorpicker/build.gradle b/andcolorpicker/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.ben-manes.versions" version "0.28.0"
+  id "com.github.ben-manes.versions" version "0.35.0"
 }
 
 apply plugin: "com.android.library"
@@ -8,12 +8,12 @@ apply plugin: "kotlin-android-extensions"
 apply plugin: "com.novoda.bintray-release"
 
 android {
-  compileSdkVersion 29
+  compileSdkVersion 30
   buildToolsVersion "29.0.3"
 
   defaultConfig {
     minSdkVersion 19
-    targetSdkVersion 29
+    targetSdkVersion 30
     versionCode 1
     versionName "1.0"
 
@@ -35,19 +35,19 @@ dependencies {
   implementation fileTree(dir: "libs", include: ["*.jar"])
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-  implementation "androidx.appcompat:appcompat:1.3.0-alpha01"
-  implementation "androidx.core:core-ktx:1.4.0-alpha01"
-  implementation "androidx.constraintlayout:constraintlayout:2.0.0-beta6"
+  implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
+  implementation "androidx.core:core-ktx:1.5.0-alpha04"
+  implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
-  testImplementation "junit:junit:4.13"
-  androidTestImplementation "androidx.test.ext:junit:1.1.2-rc01"
-  androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0-rc01"
+  testImplementation "junit:junit:4.13.1"
+  androidTestImplementation "androidx.test.ext:junit:1.1.2"
+  androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
 }
 
 publish {
   def groupProjectID = "codes.side"
   def artifactProjectID = "andcolorpicker"
-  def publishVersionID = "0.4.0"
+  def publishVersionID = "0.5.0"
   userOrg = "side-codes"
   repoName = "andColorPicker"
   groupId = groupProjectID

diff --git a/...olorpicker/src/main/java/codes/side/andcolorpicker/converter/IntegerCMYKColorConverter.kt b/...olorpicker/src/main/java/codes/side/andcolorpicker/converter/IntegerCMYKColorConverter.kt
@@ -38,7 +38,7 @@ class IntegerCMYKColorConverter : ColorConverter {
         r,
         g,
         b
-      ).max()
+      ).maxOrNull()
     )
     val c = (1f - r - k) / (1f - k)
     val m = (1f - g - k) / (1f - k)

diff --git a/andcolorpicker/src/main/java/codes/side/andcolorpicker/view/set/ColorPickerSeekBarSet.kt b/andcolorpicker/src/main/java/codes/side/andcolorpicker/view/set/ColorPickerSeekBarSet.kt
@@ -1,11 +1,11 @@
 package codes.side.andcolorpicker.view.set
 
 import android.content.Context
-import android.os.Build
 import android.util.AttributeSet
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.annotation.StringRes
+import androidx.core.widget.TextViewCompat
 import codes.side.andcolorpicker.group.PickerGroup
 import codes.side.andcolorpicker.model.Color
 
@@ -20,7 +20,7 @@ abstract class ColorPickerSeekBarSet<C : Color> @JvmOverloads constructor(
 ) {
   companion object {
     private const val TAG = "ColorPickerSeekBarSet"
-    internal const val defaultTextAppearance = android.R.style.TextAppearance_Material_Caption
+    private const val defaultTextAppearance = android.R.style.TextAppearance_Material_Caption
   }
 
   val pickerGroup = PickerGroup<C>()
@@ -46,15 +46,10 @@ abstract class ColorPickerSeekBarSet<C : Color> @JvmOverloads constructor(
       TextView(
         context
       ).also {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-          @Suppress("DEPRECATION")
-          it.setTextAppearance(
-            context,
-            defaultTextAppearance
-          )
-        } else {
-          it.setTextAppearance(defaultTextAppearance)
-        }
+        TextViewCompat.setTextAppearance(
+          it,
+          defaultTextAppearance
+        )
         it.setText(titleResId)
       }
     )

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.ben-manes.versions" version "0.28.0"
+  id "com.github.ben-manes.versions" version "0.35.0"
 }
 
 apply plugin: "com.android.application"
@@ -8,13 +8,13 @@ apply plugin: "kotlin-android-extensions"
 apply plugin: "com.google.android.gms.oss-licenses-plugin"
 
 android {
-  compileSdkVersion 29
+  compileSdkVersion 30
   buildToolsVersion "29.0.3"
 
   defaultConfig {
     applicationId "codes.side.andcolorpicker.app"
     minSdkVersion 19
-    targetSdkVersion 29
+    targetSdkVersion 30
     versionCode 1
     versionName "1.0"
 
@@ -49,27 +49,27 @@ dependencies {
   implementation project(":andcolorpicker")
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-  implementation "androidx.appcompat:appcompat:1.3.0-alpha01"
+  implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
 
-  implementation "androidx.core:core-ktx:1.4.0-alpha01"
+  implementation "androidx.core:core-ktx:1.5.0-alpha04"
 
-  implementation "androidx.recyclerview:recyclerview:1.2.0-alpha03"
+  implementation "androidx.recyclerview:recyclerview:1.2.0-alpha06"
   implementation "androidx.annotation:annotation:1.1.0"
-  implementation "androidx.fragment:fragment-ktx:1.3.0-alpha06"
-  implementation "androidx.constraintlayout:constraintlayout:2.0.0-beta6"
-  implementation "com.google.android.material:material:1.3.0-alpha01"
-  implementation "com.mikepenz:materialdrawer:8.1.1"
+  implementation "androidx.fragment:fragment-ktx:1.3.0-beta01"
+  implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+  implementation "com.google.android.material:material:1.3.0-alpha03"
+  implementation "com.mikepenz:materialdrawer:8.1.8"
 
-  implementation "com.mikepenz:iconics-core:5.0.3"
-  implementation "com.mikepenz:material-design-icons-dx-typeface:5.0.1.0-kotlin@aar"
-  implementation "com.mikepenz:fontawesome-typeface:5.9.0.0-kotlin@aar"
+  implementation "com.mikepenz:iconics-core:5.1.0"
+  implementation "com.mikepenz:material-design-icons-dx-typeface:5.0.1.1-kotlin@aar"
+  implementation "com.mikepenz:fontawesome-typeface:5.9.0.1-kotlin@aar"
 
-  implementation "com.mikepenz:fastadapter:5.1.0"
-  implementation "com.mikepenz:fastadapter-extensions-diff:5.1.0"
+  implementation "com.mikepenz:fastadapter:5.2.4"
+  implementation "com.mikepenz:fastadapter-extensions-diff:5.2.4"
 
   implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
 
-  testImplementation "junit:junit:4.13"
-  androidTestImplementation "androidx.test.ext:junit:1.1.2-rc01"
-  androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0-rc01"
+  testImplementation "junit:junit:4.13.1"
+  androidTestImplementation "androidx.test.ext:junit:1.1.2"
+  androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
 }
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = "1.3.72"
+    ext.kotlin_version = "1.4.10"
     repositories {
         google()
         jcenter()

diff --git a/integrationapp/build.gradle b/integrationapp/build.gradle
@@ -3,13 +3,13 @@ apply plugin: "kotlin-android"
 apply plugin: "kotlin-android-extensions"
 
 android {
-  compileSdkVersion 29
+  compileSdkVersion 30
   buildToolsVersion "29.0.3"
 
   defaultConfig {
     applicationId "codes.side.andcolorpicker.integrationapp"
-    minSdkVersion 21
-    targetSdkVersion 29
+    minSdkVersion 19
+    targetSdkVersion 30
     versionCode 1
     versionName "1.0"
 
@@ -39,14 +39,14 @@ android {
 dependencies {
   implementation fileTree(dir: "libs", include: ["*.jar"])
 
-  implementation "codes.side:andcolorpicker:0.4.0"
+  implementation "codes.side:andcolorpicker:0.5.0"
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-  implementation "androidx.appcompat:appcompat:1.3.0-alpha01"
-  implementation "androidx.core:core-ktx:1.4.0-alpha01"
-  implementation "androidx.constraintlayout:constraintlayout:2.0.0-beta6"
+  implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
+  implementation "androidx.core:core-ktx:1.5.0-alpha04"
+  implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
-  testImplementation "junit:junit:4.13"
-  androidTestImplementation "androidx.test.ext:junit:1.1.2-rc01"
-  androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0-rc01"
+  testImplementation "junit:junit:4.13.1"
+  androidTestImplementation "androidx.test.ext:junit:1.1.2"
+  androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ class IntegerCMYKColorConverter : ColorConverter { @@
             r,
             g,
             b
-          ).max()
+          ).maxOrNull()
         )
         val c = (1f - r - k) / (1f - k)
         val m = (1f - g - k) / (1f - k)
@@ Expand Down @@