chore: merge branch 'release/1.8.0'

.editorconfig

@@ -16,6 +16,6 @@ indent_size = 2
 indent_style = tab
 
 # Matches the exact files either package.json or .travis.yml
-[{*.json, *.yml, *.xml, *.gradle}]
+[{*.json, *.yml, *.xml, *.gradle, *.toml}]
 indent_style = space
 indent_size = 2

affogato-core-ktx/build.gradle.kts

@@ -1,42 +1,24 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-  id("java-library")
-  kotlin("jvm")
-  id("maven-publish")
-}
-
-java {
-  sourceCompatibility = JavaVersion.VERSION_17
-  targetCompatibility = JavaVersion.VERSION_17
-}
-
-tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions {
-    apiVersion = "1.8"
-    languageVersion = "1.8"
-    jvmTarget = "17"
-  }
+  id(libs.plugins.maven.publish.get().pluginId)
 }
 
-tasks.test {
-  useJUnitPlatform()
+apply {
+  from("$rootDir/library-build.gradle")
 }
 
 dependencies {
   // Serialization ---------------------------------------------------------------------------------
-  api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
+  "api"(libs.kotlinx.serialization.json)
   // Immutable Collections -------------------------------------------------------------------------
-  api("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
+  "api"(libs.kotlinx.collections.immutable)
   // DateTime --------------------------------------------------------------------------------------
-  api("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
+  "api"(libs.kotlinx.datetime)
 
   // Test ------------------------------------------------------------------------------------------
-  testImplementation("io.kotlintest:kotlintest-core:3.4.2")
-  testImplementation("com.google.truth:truth:1.1.5")
-  testImplementation("org.hamcrest:hamcrest:2.2")
-  testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
-  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
+  "testImplementation"(libs.kotlintest.core)
+  "testImplementation"(libs.hamcrest)
+  "testImplementation"(libs.bundles.junit5)
+  "testRuntimeOnly"(libs.junit.jupiter.engine)
 }
 
 afterEvaluate {
@@ -45,7 +27,7 @@ afterEvaluate {
       create<MavenPublication>("release") {
         groupId = "com.parsuomash.affogato"
         artifactId = "affogato-core-ktx"
-        version = "1.7.0"
+        version = libs.versions.affogato.get()
 
         from(components["java"])
       }

affogato-coroutines-android/build.gradle.kts

@@ -1,36 +1,21 @@
 plugins {
-  id("com.android.library")
-  kotlin("android")
-  id("maven-publish")
+  alias(libs.plugins.android.library)
+  id(libs.plugins.maven.publish.get().pluginId)
+}
+
+apply {
+  from("$rootDir/android-library-build.gradle")
 }
 
 android {
-  compileSdk = 33
-  buildToolsVersion = "33.0.2"
   namespace = "com.parsuomash.affogato.coroutines.android"
-
-  defaultConfig {
-    minSdk = 16
-    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-  }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-  }
-  kotlinOptions {
-    apiVersion = "1.8"
-    languageVersion = "1.8"
-    jvmTarget = "17"
-  }
 }
 
 dependencies {
-  api(project(":affogato-coroutines-core"))
+  api(project(AffogatoModules.coroutinesCore))
 
   // Coroutines ------------------------------------------------------------------------------------
-  api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")
-  api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.2")
-  api("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2")
+  api(libs.bundles.kotlinx.coroutines)
 }
 
 afterEvaluate {
@@ -39,7 +24,7 @@ afterEvaluate {
       create<MavenPublication>("release") {
         groupId = "com.parsuomash.affogato"
         artifactId = "affogato-coroutines-android"
-        version = "1.7.0"
+        version = libs.versions.affogato.get()
 
         from(components["release"])
       }

affogato-coroutines-core/build.gradle.kts

@@ -1,39 +1,21 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-  id("java-library")
-  kotlin("jvm")
-  id("maven-publish")
-}
-
-java {
-  sourceCompatibility = JavaVersion.VERSION_17
-  targetCompatibility = JavaVersion.VERSION_17
-}
-
-tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions {
-    apiVersion = "1.8"
-    languageVersion = "1.8"
-    jvmTarget = "17"
-  }
+  id(libs.plugins.maven.publish.get().pluginId)
 }
 
-tasks.test {
-  useJUnitPlatform()
+apply {
+  from("$rootDir/library-build.gradle")
 }
 
 dependencies {
-  implementation(project(":affogato-core-ktx"))
+  "implementation"(project(AffogatoModules.coreKtx))
 
   // Coroutines ------------------------------------------------------------------------------------
-  api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")
-  api("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.2")
+  "api"(libs.kotlinx.coroutines.core)
+  "api"(libs.kotlinx.coroutines.test)
 
   // Test ------------------------------------------------------------------------------------------
-  testImplementation("com.google.truth:truth:1.1.5")
-  testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
-  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
+  "testImplementation"(libs.bundles.junit5)
+  "testRuntimeOnly"(libs.junit.jupiter.engine)
 }
 
 afterEvaluate {
@@ -42,7 +24,7 @@ afterEvaluate {
       create<MavenPublication>("release") {
         groupId = "com.parsuomash.affogato"
         artifactId = "affogato-coroutines-core"
-        version = "1.7.0"
+        version = libs.versions.affogato.get()
 
         from(components["java"])
       }

affogato-hilt-binding-processor/build.gradle.kts

@@ -1,32 +1,16 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-  id("java-library")
-  kotlin("jvm")
-  id("maven-publish")
+  id(libs.plugins.maven.publish.get().pluginId)
 }
 
-java {
-  sourceCompatibility = JavaVersion.VERSION_17
-  targetCompatibility = JavaVersion.VERSION_17
-}
-
-tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions {
-    apiVersion = "1.8"
-    languageVersion = "1.8"
-    jvmTarget = "17"
-  }
+apply {
+  from("$rootDir/library-build.gradle")
 }
 
 dependencies {
   // KSP -------------------------------------------------------------------------------------------
-  implementation("com.google.devtools.ksp:symbol-processing-api:1.8.22-1.0.11")
-  implementation("com.fleshgrinder.kotlin:case-format:0.2.0")
-
+  "implementation"(libs.bundles.processing)
   // Test ------------------------------------------------------------------------------------------
-  testImplementation("junit:junit:4.13.2")
-  testImplementation("com.google.truth:truth:1.1.5")
+  "testImplementation"(libs.bundles.junit4)
 }
 
 afterEvaluate {
@@ -35,7 +19,7 @@ afterEvaluate {
       create<MavenPublication>("release") {
         groupId = "com.parsuomash.affogato"
         artifactId = "affogato-hilt-binding-processor"
-        version = "1.7.0"
+        version = libs.versions.affogato.get()
 
         from(components["java"])
       }

affogato-hilt-binding/build.gradle.kts

@@ -1,37 +1,23 @@
 plugins {
-  id("com.android.library")
-  kotlin("android")
-  id("maven-publish")
+  alias(libs.plugins.android.library)
+  id(libs.plugins.maven.publish.get().pluginId)
+}
+
+apply {
+  from("$rootDir/android-library-build.gradle")
 }
 
 android {
-  compileSdk = 33
-  buildToolsVersion = "33.0.2"
   namespace = "com.parsuomash.affogato.hilt.binding"
-
-  defaultConfig {
-    minSdk = 16
-    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-  }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-  }
-  kotlinOptions {
-    apiVersion = "1.8"
-    languageVersion = "1.8"
-    jvmTarget = "17"
-  }
 }
 
 dependencies {
   // Hilt ------------------------------------------------------------------------------------------
-  api("com.google.dagger:hilt-android:2.46.1")
+  api(libs.hilt.android)
 
   // Test ------------------------------------------------------------------------------------------
-  testImplementation("com.google.truth:truth:1.1.5")
-  testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
-  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
+  testImplementation(libs.bundles.junit5)
+  testRuntimeOnly(libs.junit.jupiter.engine)
 }
 
 afterEvaluate {
@@ -40,7 +26,7 @@ afterEvaluate {
       create<MavenPublication>("release") {
         groupId = "com.parsuomash.affogato"
         artifactId = "affogato-hilt-binding"
-        version = "1.7.0"
+        version = libs.versions.affogato.get()
 
         from(components["release"])
       }

affogato-logger-android/build.gradle.kts

@@ -1,31 +1,18 @@
 plugins {
-  id("com.android.library")
-  kotlin("android")
-  id("maven-publish")
+  alias(libs.plugins.android.library)
+  id(libs.plugins.maven.publish.get().pluginId)
+}
+
+apply {
+  from("$rootDir/android-library-build.gradle")
 }
 
 android {
-  compileSdk = 33
-  buildToolsVersion = "33.0.2"
   namespace = "com.parsuomash.affogato.logger.android"
-
-  defaultConfig {
-    minSdk = 16
-    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-  }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-  }
-  kotlinOptions {
-    apiVersion = "1.8"
-    languageVersion = "1.8"
-    jvmTarget = "17"
-  }
 }
 
 dependencies {
-  implementation("com.jakewharton.timber:timber:5.0.1")
+  implementation(libs.timber)
 }
 
 afterEvaluate {
@@ -34,7 +21,7 @@ afterEvaluate {
       create<MavenPublication>("release") {
         groupId = "com.parsuomash.affogato"
         artifactId = "affogato-logger-android"
-        version = "1.7.0"
+        version = libs.versions.affogato.get()
 
         from(components["release"])
       }

affogato-metrica-ktx/build.gradle.kts

@@ -1,37 +1,25 @@
 plugins {
-  id("com.android.library")
-  kotlin("android")
-  id("maven-publish")
+  alias(libs.plugins.android.library)
+  id(libs.plugins.maven.publish.get().pluginId)
+}
+
+apply {
+  from("$rootDir/android-library-build.gradle")
 }
 
 android {
-  compileSdk = 33
-  buildToolsVersion = "33.0.2"
   namespace = "com.parsuomash.affogato.metrica.ktx"
 
   defaultConfig {
     minSdk = 17
-    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-  }
-  compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-  }
-  kotlinOptions {
-    apiVersion = "1.8"
-    languageVersion = "1.8"
-    jvmTarget = "17"
   }
 }
 
 dependencies {
   // AppMetrica ------------------------------------------------------------------------------------
-  api("com.yandex.android:mobmetricalib:5.3.0")
-  api("com.yandex.android:mobmetricapushlib:2.2.0")
-  api("com.yandex.android:appmetricapush-provider-hms:2.2.0")
-
+  api(libs.bundles.metrica)
   // Serialization ---------------------------------------------------------------------------------
-  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
+  implementation(libs.kotlinx.serialization.json)
 }
 
 afterEvaluate {
@@ -40,7 +28,7 @@ afterEvaluate {
       create<MavenPublication>("release") {
         groupId = "com.parsuomash.affogato"
         artifactId = "affogato-metrica-ktx"
-        version = "1.7.0"
+        version = libs.versions.affogato.get()
 
         from(components["release"])
       }