Merge pull request #4 from LikeTheSalad/release/2.2.0

Release/2.2.0

CHANGELOG.md

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 2.2.0
+---
+
+* Updating utilities.
+
 Version 2.1.0
 ---
 

android-resource-api/build.gradle

@@ -1,18 +1,9 @@
 plugins {
-    id 'java-library'
-    id 'org.jetbrains.kotlin.jvm'
+    alias(libs.plugins.java.library)
 }
 
 dependencies {
     api project(":resource-api")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    testImplementation "com.likethesalad.tools.testing:unit-testing:$testingUtilities_version"
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    testImplementation libs.unitTesting
+    testImplementation libs.kotlin.reflect
 }

android-resource-collector/build.gradle

@@ -1,25 +1,24 @@
 plugins {
-    id 'java-library'
-    id 'org.jetbrains.kotlin.jvm'
+    alias(libs.plugins.java.library)
     id 'kotlin-kapt'
 }
 
 dependencies {
     api project(':resource-collector')
-    implementation "com.likethesalad.tools:android-tools-plugin:$androidTools_version"
     implementation project(':android-resource-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compileOnly "com.google.dagger:dagger:$dagger_version"
-    kapt "com.google.dagger:dagger-compiler:$dagger_version"
-    testImplementation "com.likethesalad.tools.testing:unit-testing:$testingUtilities_version"
+    implementation libs.androidCompatApi
+    embedded libs.dagger
+    kapt libs.dagger.compiler
+    testImplementation libs.unitTesting
     testImplementation gradleApi()
 }
 
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+shadowExtension {
+    relocate("dagger", "${group}.resourcecollector.dagger")
 }
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+
+libConventions {
+    setJavaVersion("11")
 }
 
 kapt {

android-resource-locator-test/build.gradle

@@ -1,18 +1,17 @@
 plugins {
+    alias(libs.plugins.java.library)
+    alias(libs.plugins.androidTestTools)
     id 'java-gradle-plugin'
-    id 'org.jetbrains.kotlin.jvm'
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation project(':string-android-resource-locator')
-    compileOnly("com.android.tools.build:gradle:3.3.3")
-    compileOnly "com.google.dagger:dagger:$dagger_version"
-    testImplementation "com.likethesalad.tools.testing:android-gradle:$testingUtilities_version"
+    testPluginClasspath "com.android.tools.build:gradle:7.4.0"
+    testPluginClasspath libs.dagger
 }
 
-tasks.withType(PluginUnderTestMetadata).configureEach {
-    pluginClasspath.from(configurations.compileOnly)
+libConventions {
+    setJavaVersion("11")
 }
 
 gradlePlugin {
@@ -22,14 +21,6 @@ gradlePlugin {
             implementationClass = 'com.likethesalad.tools.resource.locator.android.test.TestAndroidResourceLocatorPlugin'
         }
     }
-    automatedPublishing = false
-}
-
-compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
 }
 
 artifactPublisherTarget {