Dependencies/version bump

buildSrc/build.gradle.kts

@@ -1,11 +1,12 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
+
 plugins {
     `kotlin-dsl`
     `maven-publish`
 }
 
 repositories {
     google()
-    jcenter()
     mavenCentral()
     maven {
         setUrl("https://www.jitpack.io")
@@ -15,11 +16,22 @@ repositories {
     }
 }
 
-val kotlinVersion = "1.5.31"
-val buildToolsVersion = "7.0.3"
-val dokkaVersion = "1.5.31"
-val manesVersion = "0.33.0"
-val spotlessVersion = "5.12.1"
+tasks.withType(KotlinJvmCompile::class.java) {
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+val buildToolsVersion = "7.2.1"
+val kotlinVersion = "1.6.21"
+val dokkaVersion = "1.6.21"
+val manesVersion = "0.38.0"
+val spotlessVersion = "6.9.0"
 
 dependencies {
     /* Depend on the android gradle plugin, since we want to access it in our plugin */

buildSrc/src/main/java/io/wax911/emoji/buildSrc/Libraries.kt

@@ -7,37 +7,38 @@ object Libraries {
     const val timber = "com.jakewharton.timber:timber:${Versions.timber}"
 
     const val junit = "junit:junit:${Versions.junit}"
-    const val mockk = "io.mockk:mockk:${Versions.mockk}"
 
     object Android {
 
         object Tools {
-            private const val version = "7.0.3"
+            private const val version = "7.2.1"
             const val buildGradle = "com.android.tools.build:gradle:$version"
         }
     }
 
     object AndroidX {
 
         object Core {
-            private const val version = "1.6.0"
+            private const val version = "1.8.0"
             const val core = "androidx.core:core:$version"
             const val coreKtx = "androidx.core:core-ktx:$version"
         }
 
         object ConstraintLayout {
-            private const val version = "2.1.1"
+            private const val version = "2.1.4"
             const val constraintLayout = "androidx.constraintlayout:constraintlayout:$version"
-            const val constraintLayoutSolver = "androidx.constraintlayout:constraintlayout-solver:$version"
         }
 
         object Emoji {
             private const val version = "1.1.0"
-            const val appCompat = "androidx.emoji:emoji-appcompat:$version"
+            const val emoji = "androidx.emoji2.emoji2:emoji2:$version"
+            const val bundled = "androidx.emoji2.emoji2:emoji2-bundled:$version"
+            const val views = "androidx.emoji2.emoji2:emoji2-views:$version"
+            const val viewsHelper = "androidx.emoji2.emoji2:emoji2-views-helper:$version"
         }
 
         object Lifecycle {
-            private const val version = "2.3.0"
+            private const val version = "2.5.0"
             const val extensions = "androidx.lifecycle:lifecycle-extensions:2.2.0"
             const val runTimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:$version"
             const val liveDataKtx = "androidx.lifecycle:lifecycle-livedata-ktx:$version"
@@ -59,18 +60,18 @@ object Libraries {
         }
 
         object StartUp {
-            private const val version = "1.1.0"
+            private const val version = "1.1.1"
             const val startUpRuntime = "androidx.startup:startup-runtime:$version"
         }
 
         object Test {
-            private const val version = "1.3.0"
+            private const val version = "1.4.0"
             const val core = "androidx.test:core:$version"
             const val runner = "androidx.test:runner:$version"
             const val rules = "androidx.test:rules:$version"
 
             object Extension {
-                private const val version = "1.1.2"
+                private const val version = "1.1.3"
                 const val junit = "androidx.test.ext:junit:$version"
                 const val junitKtx = "androidx.test.ext:junit-ktx:$version"
             }
@@ -86,28 +87,23 @@ object Libraries {
 
     object CashApp {
         object Turbine {
-            private const val version = "0.7.0"
+            private const val version = "0.8.0"
             const val turbine = "app.cash.turbine:turbine:$version"
         }
     }
 
     object Google {
 
         object Material {
-            private const val version = "1.3.0"
+            private const val version = "1.6.1"
             const val material = "com.google.android.material:material:$version"
         }
     }
 
     object JetBrains {
 
-        object Dokka {
-            private const val version = "1.5.31"
-            const val gradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:$version"
-        }
-
         object Kotlin {
-            private const val version = "1.5.31"
+            private const val version = Versions.kotlin
             const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
             const val reflect = "org.jetbrains.kotlin:kotlin-reflect:$version"
 
@@ -126,16 +122,22 @@ object Libraries {
 
         object KotlinX {
             object Coroutines {
-                private const val version = "1.5.2"
+                private const val version = "1.6.4"
                 const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
                 const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
                 const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
             }
 
             object Serialization {
-                private const val version = "1.3.0"
+                private const val version = "1.3.3"
                 const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json:$version"
             }
         }
     }
+
+    object Mockk {
+        private const val version = "1.12.4"
+        const val mockk = "io.mockk:mockk:$version"
+        const val mockkAndroid = "io.mockk:mockk-android:$version"
+    }
 }

buildSrc/src/main/java/io/wax911/emoji/buildSrc/common/Configuration.kt

@@ -0,0 +1,29 @@
+package io.wax911.emoji.buildSrc.common
+
+object Configuration {
+
+    private fun Int.toVersion(): String {
+        return if (this < 9) "0$this" else "$this"
+    }
+
+    const val compileSdk = 32
+    const val targetSdk = 32
+    const val minSdk = 21
+
+    private const val major = 1
+    private const val minor = 7
+    private const val patch = 0
+    private const val revision = 0
+
+    private const val channel = "rc"
+
+    const val versionCode = major.times(1_000_000_000) +
+            minor.times(1_000_000) +
+            patch.times(1_000) +
+            revision
+
+    val versionName = if (revision > 1)
+        "$major.$minor.$patch-${channel}${revision.toVersion()}"
+    else
+        "$major.$minor.$patch"
+}

buildSrc/src/main/java/io/wax911/emoji/buildSrc/common/Versions.kt

@@ -2,30 +2,10 @@ package io.wax911.emoji.buildSrc.common
 
 object Versions {
 
-    private fun Int.toVersion(): String {
-        return if (this < 9) "0$this" else "$this"
-    }
-
-    const val compileSdk = 30
-    const val targetSdk = 30
-    const val minSdk = 21
-
-    private const val major = 1
-    private const val minor = 7
-    private const val patch = 0
-    private const val revision = 0
-
-    private const val channel = "rc"
-
-    const val versionCode = major * 100_000 + minor * 10_000 + patch * 1_000 + revision * 100
-    val versionName = if (revision > 1)
-        "$major.$minor.$patch-${channel}${revision.toVersion()}"
-    else
-        "$major.$minor.$patch"
-
-    const val mockk = "1.12.0"
     const val junit = "4.13.2"
 
     const val timber = "5.0.1"
-    const val ktlint = "0.40.0"
+    const val ktlint = "0.46.1"
+
+    const val kotlin = "1.6.21"
 }

buildSrc/src/main/java/io/wax911/emoji/buildSrc/plugin/components/AndroidConfiguration.kt

@@ -1,6 +1,7 @@
 package io.wax911.emoji.buildSrc.plugin.components
 
 import io.wax911.emoji.buildSrc.common.Versions
+import io.wax911.emoji.buildSrc.common.Configuration
 import com.android.build.gradle.internal.dsl.DefaultConfig
 import io.wax911.emoji.buildSrc.plugin.extensions.*
 import io.wax911.emoji.buildSrc.plugin.extensions.baseAppExtension
@@ -26,6 +27,14 @@ internal fun Project.configureSpotless() {
         }
 }
 
+private fun Project.configureLint() = baseAppExtension().run {
+    lint {
+        abortOnError = false
+        ignoreWarnings = false
+        ignoreTestSources = true
+    }
+}
+
 @Suppress("UnstableApiUsage")
 private fun DefaultConfig.applyAdditionalConfiguration(project: Project) {
     if (project.isSampleModule()) {
@@ -41,12 +50,12 @@ private fun DefaultConfig.applyAdditionalConfiguration(project: Project) {
 }
 
 internal fun Project.configureAndroid(): Unit = baseExtension().run {
-    compileSdkVersion(Versions.compileSdk)
+    compileSdkVersion(Configuration.compileSdk)
     defaultConfig {
-        minSdk = Versions.minSdk
-        targetSdk = Versions.targetSdk
-        versionCode = Versions.versionCode
-        versionName = Versions.versionName
+        minSdk = Configuration.minSdk
+        targetSdk = Configuration.targetSdk
+        versionCode = Configuration.versionCode
+        versionName = Configuration.versionName
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         applyAdditionalConfiguration(project)
     }
@@ -65,9 +74,9 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run {
     }
 
     packagingOptions {
-        excludes.add("META-INF/NOTICE.txt")
-        excludes.add("META-INF/LICENSE")
-        excludes.add("META-INF/LICENSE.txt")
+        resources.excludes.add("META-INF/NOTICE.txt")
+        resources.excludes.add("META-INF/LICENSE")
+        resources.excludes.add("META-INF/LICENSE.txt")
     }
 
     sourceSets {
@@ -82,29 +91,27 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run {
         unitTests.isReturnDefaultValues = true
     }
 
-    lintOptions {
-        isAbortOnError = false
-        isIgnoreWarnings = false
-        isIgnoreTestSources = true
+    if (isSampleModule()) {
+        configureLint()
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     tasks.withType(KotlinCompile::class.java) {
         kotlinOptions {
             allWarningsAsErrors = false
             kotlinOptions {
                 allWarningsAsErrors = false
-                val compileArgs = mutableListOf("-Xopt-in=kotlin.Experimental")
+                val compileArgs = mutableListOf("-opt-in=kotlin.Experimental")
                 if (isSampleModule()) {
-                    compileArgs.add("-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi")
-                    compileArgs.add("-Xopt-in=kotlinx.coroutines.FlowPreview")
-                    compileArgs.add("-Xopt-in=kotlin.Experimental")
+                    compileArgs.add("-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi")
+                    compileArgs.add("-opt-in=kotlinx.coroutines.FlowPreview")
+                    compileArgs.add("-opt-in=kotlin.Experimental")
                 } else
-                    compileArgs.add("-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi")
+                    compileArgs.add("-opt-in=kotlinx.serialization.ExperimentalSerializationApi")
                 // Filter out modules that won't be using coroutines
                 freeCompilerArgs = compileArgs
             }
@@ -113,7 +120,7 @@ internal fun Project.configureAndroid(): Unit = baseExtension().run {
 
     tasks.withType(KotlinJvmCompile::class.java) {
         kotlinOptions {
-            jvmTarget = "1.8"
+            jvmTarget = "11"
         }
     }
 }