Update project

michaelbel · Apr 28, 2023 · f273f91 · f273f91
1 parent 71d451e
commit f273f91
Show file tree

Hide file tree

Showing 59 changed files with 411 additions and 360 deletions.
diff --git a/.github/workflows/check_pr.yml b/.github/workflows/check_pr.yml
@@ -40,11 +40,11 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,17 +1,18 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
-import java.io.FileInputStream
 import org.apache.commons.io.output.ByteArrayOutputStream
 import org.jetbrains.kotlin.konan.properties.Properties
+import java.io.FileInputStream
 
+@Suppress("dsl_scope_violation")
 plugins {
-    id("movies-android-application")
-    id("movies-android-application-compose")
+    alias(libs.plugins.application)
+    alias(libs.plugins.kotlin)
+    alias(libs.plugins.androidx.navigation.safeargs)
+    alias(libs.plugins.google.services)
+    alias(libs.plugins.firebase.appdistribution)
+    alias(libs.plugins.firebase.crashlytics)
+    alias(libs.plugins.palantir.git)
     id("movies-android-hilt")
-    id("androidx.navigation.safeargs")
-    id("com.google.gms.google-services")
-    id("com.google.firebase.appdistribution")
-    id("com.google.firebase.crashlytics")
-    id("com.palantir.git-version")
 }
 
 val gitCommitsCount: Int by lazy {
@@ -27,11 +28,11 @@ val currentTime: Long by lazy {
     System.currentTimeMillis()
 }
 
-val admobAppId: String by lazy {
+val admobAppId: String? by lazy {
     gradleLocalProperties(rootDir).getProperty("ADMOB_APP_ID")
 }
 
-val admobBannerId: String by lazy {
+val admobBannerId: String? by lazy {
     gradleLocalProperties(rootDir).getProperty("ADMOB_BANNER_ID")
 }
 
@@ -129,13 +130,19 @@ android {
     }
 
     buildFeatures {
+        buildConfig = true
         compose = true
     }
 
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     lint {
         quiet = true
         abortOnError = false
@@ -165,4 +172,6 @@ dependencies {
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.benchmark.junit)
+
+    lintChecks(libs.lint.checks)
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,4 @@
+@Suppress("dsl_scope_violation")
 plugins {
     alias(libs.plugins.application) apply false
     alias(libs.plugins.library) apply false
@@ -12,10 +13,9 @@ plugins {
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.spotless)
     alias(libs.plugins.detekt)
-
-    id("com.github.ben-manes.versions") version "0.46.0"
-    id("nl.littlerobots.version-catalog-update") version "0.8.0"
-    id("com.palantir.git-version") version "2.0.0"
+    alias(libs.plugins.palantir.git)
+    alias(libs.plugins.ben.manes.versions)
+    alias(libs.plugins.littlerobots.version.catalog.update)
 }
 
 /**

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -10,22 +10,6 @@ dependencies {
 
 gradlePlugin {
     plugins {
-        register("androidApplication") {
-            id = "movies-android-application"
-            implementationClass = "plugins.AndroidApplicationConventionPlugin"
-        }
-        register("androidLibrary") {
-            id = "movies-android-library"
-            implementationClass = "plugins.AndroidLibraryConventionPlugin"
-        }
-        register("androidComposeApplication") {
-            id = "movies-android-application-compose"
-            implementationClass = "plugins.AndroidComposeApplicationConventionPlugin"
-        }
-        register("androidComposeLibrary") {
-            id = "movies-android-library-compose"
-            implementationClass = "plugins.AndroidComposeLibraryConventionPlugin"
-        }
         register("androidHilt") {
             id = "movies-android-hilt"
             implementationClass = "plugins.AndroidHiltConventionPlugin"

diff --git a/buildSrc/src/main/kotlin/plugins/AndroidApplicationConventionPlugin.kt b/buildSrc/src/main/kotlin/plugins/AndroidApplicationConventionPlugin.kt
diff --git a/buildSrc/src/main/kotlin/plugins/AndroidComposeApplicationConventionPlugin.kt b/buildSrc/src/main/kotlin/plugins/AndroidComposeApplicationConventionPlugin.kt
diff --git a/buildSrc/src/main/kotlin/plugins/AndroidComposeLibraryConventionPlugin.kt b/buildSrc/src/main/kotlin/plugins/AndroidComposeLibraryConventionPlugin.kt
diff --git a/buildSrc/src/main/kotlin/plugins/AndroidLibraryConventionPlugin.kt b/buildSrc/src/main/kotlin/plugins/AndroidLibraryConventionPlugin.kt
diff --git a/core/ads/build.gradle.kts b/core/ads/build.gradle.kts
@@ -1,5 +1,7 @@
+@Suppress("dsl_scope_violation")
 plugins {
-    id("movies-android-library")
+    alias(libs.plugins.library)
+    alias(libs.plugins.kotlin)
 }
 
 android {
@@ -18,6 +20,11 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     lint {
         quiet = true
         abortOnError = false

diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts
@@ -1,5 +1,7 @@
+@Suppress("dsl_scope_violation")
 plugins {
-    id("movies-android-library")
+    alias(libs.plugins.library)
+    alias(libs.plugins.kotlin)
     id("movies-android-hilt")
 }
 
@@ -19,6 +21,11 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     lint {
         quiet = true
         abortOnError = false

diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -1,6 +1,7 @@
+@Suppress("dsl_scope_violation")
 plugins {
-    id("movies-android-library")
-    id("movies-android-library-compose")
+    alias(libs.plugins.library)
+    alias(libs.plugins.kotlin)
     id("movies-android-hilt")
 }
 
@@ -29,13 +30,19 @@ android {
     }
 
     buildFeatures {
+        buildConfig = true
         compose = true
     }
 
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     lint {
         quiet = true
         abortOnError = false
@@ -60,4 +67,6 @@ dependencies {
     implementation(libs.firebase.crashlytics)
     implementation(libs.androidx.startup.runtime)
     implementation(libs.androidx.browser)
+
+    lintChecks(libs.lint.checks)
 }
diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts
@@ -1,7 +1,9 @@
+@Suppress("dsl_scope_violation")
 plugins {
-    id("movies-android-library")
+    alias(libs.plugins.library)
+    alias(libs.plugins.kotlin)
+    alias(libs.plugins.kotlin.ksp)
     id("movies-android-hilt")
-    id("com.google.devtools.ksp")
 }
 
 android {
@@ -28,6 +30,11 @@ android {
         )
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     lint {
         quiet = true
         abortOnError = false
@@ -45,7 +52,6 @@ dependencies {
     implementation(libs.bundles.datastore)
     implementation(libs.bundles.room)
     api(libs.androidx.hilt.work)
-    kapt(libs.androidx.hilt.compiler)
     api(libs.androidx.work.runtime.ktx)
     ksp(libs.androidx.room.compiler)
 }
diff --git a/core/entities/build.gradle.kts b/core/entities/build.gradle.kts
@@ -1,7 +1,9 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 
+@Suppress("dsl_scope_violation")
 plugins {
-    id("movies-android-library")
+    alias(libs.plugins.library)
+    alias(libs.plugins.kotlin)
     id("movies-android-hilt")
 }
 
@@ -28,6 +30,15 @@ android {
         }
     }
 
+    buildFeatures {
+        buildConfig = true
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     lint {
         quiet = true
         abortOnError = false

diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts
@@ -1,5 +1,7 @@
+@Suppress("dsl_scope_violation")
 plugins {
-    id("movies-android-library")
+    alias(libs.plugins.library)
+    alias(libs.plugins.kotlin)
 }
 
 android {
@@ -18,6 +20,11 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     lint {
         quiet = true
         abortOnError = false