Merge pull request #5 from vadiole/develop

Release 1.0.4

README.md

@@ -16,12 +16,12 @@
 
 Kotlin DSL:
 ```kotlin
-implementation("io.github.vadiole:colorpicker:1.0.3")
+implementation("io.github.vadiole:colorpicker:1.0.4")
 ```
 
 Groove:
 ```gradle
-implementation 'io.github.vadiole:colorpicker:1.0.3'
+implementation 'io.github.vadiole:colorpicker:1.0.4'
 ```
 
 ### Usage
@@ -60,20 +60,3 @@ colorPicker.show(supportFragmentManager, "color_picker")
 // Show dialog from Fragment
 colorPicker.show(childFragmentManager, "color_picker")      
 ```
-
-### License
-```
-Copyright 2021 vadiole
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-```

build.gradle

@@ -1,14 +1,14 @@
 buildscript {
-    ext.verName = "1.0.3"
+    ext.verName = "1.0.4"
 
     repositories {
         google()
         gradlePluginPortal()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
+        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
     }
 }
 
@@ -20,6 +20,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

colorpicker/build.gradle

@@ -4,11 +4,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
+    namespace 'vadiole.colorpicker'
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
     }
 
     buildTypes {
@@ -23,10 +24,10 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
         kotlinOptions {
-            jvmTarget = '11'
+            jvmTarget = '17'
         }
     }
 
@@ -38,13 +39,13 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
 }
 
 ext {
     PUBLISH_GROUP_ID = 'io.github.vadiole'
     PUBLISH_ARTIFACT_ID = 'colorpicker'
-    PUBLISH_VERSION = '1.0.3'
+    PUBLISH_VERSION = '1.0.4'
 }
 
 apply from: "${rootProject.projectDir}/scripts/publish-mavencentral.gradle"

colorpicker/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="vadiole.colorpicker" />
+<manifest />

demo/build.gradle

@@ -5,14 +5,14 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
-
+    namespace 'vadiole.colorpickerdemo'
     defaultConfig {
         applicationId "vadiole.colorpickerdemo"
         minSdkVersion 21
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
         versionCode 1
-        versionName "1.0.3"
+        versionName "1.0.4"
     }
 
     buildTypes {
@@ -26,17 +26,17 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
 dependencies {
     implementation project(':colorpicker')
 
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }

demo/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="vadiole.colorpickerdemo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

gradle.properties

@@ -17,3 +17,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip