Merge pull request #34 from marcauberer/dev

Release of version 1.0.2
marcauberer · Jul 31, 2021 · e7dc008 · e7dc008
2 parents 22e21f9 + 02fea2c
commit e7dc008
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 33 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ The first step for using this library is, to add it to the dependency section in
 
 Add dependencies to build.gradle file on module level (e.g. app/build.gradle):
 ```gradle
-implementation 'com.chillibits:adobecolortool:1.0.1'
+implementation 'com.chillibits:adobecolortool:1.0.2'
 ```
 Also you have to declare a file provider in your manifest, which should look similar to this one:
 ```xml
@@ -77,7 +77,7 @@ AdobeColorTool(this).importColorList(this, object: AdobeColorTool.AdobeImportLis
     }
 })
 ```
-The selected file will automatically be analyzed, whether it is a ACO or ASE file and you get back a object of type `Map<String, List<AdobeColor>>` in the `onComplete` callback method.
+The selected file will automatically be analyzed, whether it is a ACO or ASE file and you get back an object of type `Map<String, List<AdobeColor>>` in the `onComplete` callback method.
 The map will contain key value pairs, which represents all imported color groups. The key is the group name and the value is a list of type `AdobeColor` with the actual color values.
 An import of the ACO format will result in a single color group with the name `ACO Import`, containing all color values.
 
@@ -149,4 +149,4 @@ If you want to contribute to this project, please feel free to send us a pull re
 ## Credits
 Thanks to all contributors and translators!
 
-© Marc Auberer 2020-2021
+© Marc Auberer 2020-2021
diff --git a/adobecolor/build.gradle b/adobecolor/build.gradle
@@ -32,7 +32,8 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = '11'
+        useIR = true
     }
 
     // specify the artifactId as module-name for kotlin
@@ -42,17 +43,17 @@ android {
 dependencies {
     // Base dependencies
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
 
     // External dependencies
     implementation 'com.github.florent37:inline-activity-result-kotlin:1.0.4'
 
     // Test dependencies
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 
 dokkaHtml.configure {

diff --git a/app/build.gradle b/app/build.gradle
@@ -32,7 +32,8 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = '11'
+        useIR = true
     }
 }
 
@@ -42,13 +43,13 @@ dependencies {
 
     // Base dependencies
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
     // Test dependencies
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/build.gradle b/build.gradle
@@ -6,16 +6,16 @@ buildscript {
     ext {
         libraryVersion = "$VERSION"
         libraryVersionCode = Integer.parseInt(rootProject.properties["VERSION_CODE"])
-        kotlinVersion = '1.4.32'
+        kotlinVersion = '1.5.21'
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.32'
+        classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.0'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -26,8 +26,8 @@ kotlin.code.style=official
 
 # Custom settings
 GROUP=com.chillibits
-VERSION=1.0.1
-VERSION_CODE=1001
+VERSION=1.0.2
+VERSION_CODE=1002
 POM_URL=https://github.com/marcauberer/adobe-color-tool
 POM_SCM_URL=https://github.com/marcauberer/adobe-color-tool
 POM_SCM_CONNECTION=scm:[email protected]:marcauberer/adobe-color-tool.git

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -7,4 +7,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip