Merge branch 'development' into TOA-180/kotlinter_plugin

StreamHistory.md

@@ -600,7 +600,7 @@ PRs:
 YouTube:
 * Coming Soon
 
-## Stream Thirty Eight - Kotlinter Migration
+## Stream Thirty Eight? - Kotlinter Migration
 
 In this stream, we migrated away from a no longer maintained ktlint plugin to the new kotlinter gradle plugin.
 
@@ -609,3 +609,13 @@ PRs:
 
 YouTube:
 * Coming Soon
+
+## Stream Thirty Nine? - Migrating To Gradle Version Catalogs
+
+In this stream, we modified the dependency management to use gradle version catalogs.
+
+PRs:
+* Gradle version catalogs: https://github.com/AdamMc331/TOA/pull/185
+
+YouTube:
+* Coming Soon

app/build.gradle.kts

@@ -0,0 +1,181 @@
+import com.google.protobuf.gradle.builtins
+import com.google.protobuf.gradle.generateProtoTasks
+import com.google.protobuf.gradle.id
+import com.google.protobuf.gradle.protobuf
+import com.google.protobuf.gradle.protoc
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    id("kotlin-kapt")
+    id("dagger.hilt.android.plugin")
+    id("com.google.devtools.ksp").version("1.7.21-1.0.8")
+    id("com.google.protobuf").version("0.8.17")
+}
+
+kotlin {
+    sourceSets {
+        debug {
+            kotlin.srcDir("build/generated/ksp/debug/kotlin")
+        }
+        release {
+            kotlin.srcDir("build/generated/ksp/release/kotlin")
+        }
+    }
+}
+
+apply(from = "../buildscripts/jacoco.gradle")
+apply(from = "../buildscripts/coveralls.gradle")
+
+android {
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    defaultConfig {
+        applicationId = "com.adammcneilly.toa"
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.compileSdk.get().toInt()
+        versionCode = 1
+        versionName = "1.0.0"
+
+        testInstrumentationRunner = "com.adammcneilly.toa.HiltTestRunner"
+
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+        debug {
+            isTestCoverageEnabled = true
+        }
+    }
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+
+        freeCompilerArgs += listOf(
+            "-Xopt-in=kotlin.time.ExperimentalTime",
+            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
+        )
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.0-alpha02"
+    }
+    packagingOptions {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+
+    testOptions {
+        unitTests.all {
+            kover {
+                isEnabled = true
+//                excludes = listOf(
+//                        "dagger.hilt.internal.aggregatedroot.codegen.*",
+//                        "hilt_aggregated_deps.*",
+//                        "com.adammcneilly.toa.core.di.*",
+//                        "com.adammcneilly.toa.core.ui.theme.*",
+//                        ".*ComposableSingletons.*",
+//                        ".*Hilt.*",
+//                        ".*BuildConfig.*",
+//                        ".*_Factory.*",
+//                )
+            }
+        }
+    }
+
+    sourceSets {
+        getByName("test") {
+            java.srcDir(project(":task-api-test").file("src/commonMain/kotlin"))
+        }
+    }
+
+    applicationVariants.forEach { variant ->
+        kotlin.sourceSets {
+            getByName(variant.name) {
+                kotlin.srcDir("build/generated/ksp/${variant.name}/kotlin")
+            }
+        }
+    }
+}
+
+dependencies {
+
+    androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(libs.androidx.test.junit)
+    androidTestImplementation(libs.google.truth)
+    androidTestImplementation(libs.hilt.android.testing)
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
+    debugImplementation(libs.androidx.compose.ui.test.manifest)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.accompanist.navigation.animation)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.material3.windowsizeclass)
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.datastore)
+    implementation(libs.androidx.ktx.core)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.material)
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.room.ktx)
+    implementation(libs.androidx.room.runtime)
+    implementation(libs.androidx.window)
+    implementation(libs.bundles.accompanist)
+    implementation(libs.compose.destinations.animations.core)
+    implementation(libs.google.protobuf.javalite)
+    implementation(libs.hilt.android)
+    implementation(libs.hilt.navigation.compose)
+    implementation(project(":core-data"))
+    implementation(project(":core-models"))
+    implementation(project(":task-api"))
+    kapt(libs.hilt.compiler)
+    kaptAndroidTest(libs.hilt.android.compiler)
+    ksp(libs.androidx.room.compiler)
+    ksp(libs.compose.destinations.ksp)
+    lintChecks(project(":lint-checks"))
+    testImplementation(libs.cash.turbine)
+    testImplementation(libs.google.truth)
+    testImplementation(libs.junit)
+    testImplementation(libs.kotlinx.coroutines.test)
+    testImplementation(libs.mockk)
+    testImplementation(project(":task-api-test"))
+}
+
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:3.21.12"
+    }
+
+    // Generates the java Protobuf-lite code for the Protobufs in this project. See
+    // https://github.com/google/protobuf-gradle-plugin#customizing-protobuf-compilation
+    // for more information.
+    generateProtoTasks {
+        all().forEach {
+            it.builtins {
+                id("java") {
+                    option("lite")
+                }
+            }
+        }
+    }
+}

app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html