소스 검색

agp upgrade

agp upgrade
Milan Jurkulak 3 년 전
부모
커밋
02af926300
5개의 변경된 파일과 13개의 추가작업 그리고 9개의 파일을 삭제
  1. 3 2
      app/build.gradle.kts
  2. 5 4
      build.gradle.kts
  3. 1 0
      buildSrc/build.gradle.kts
  4. 1 1
      buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/MainAppPlugin.kt
  5. 3 2
      tvlib/build.gradle.kts

+ 3 - 2
app/build.gradle.kts

@@ -32,6 +32,7 @@ plugins {
     id("io.objectbox")
     id("MainAppPlugin")
     kotlin("kapt")
+    id("com.google.devtools.ksp")
 }
 
 android {
@@ -195,7 +196,7 @@ dependencies {
     // more icons
     implementation("androidx.compose.material:material-icons-extended:1.4.3")
     // tv compose
-    implementation("androidx.tv:tv-foundation:1.0.0-SNAPSHOT")
+    implementation("androidx.tv:tv-foundation:1.0.0-alpha08")
     implementation("androidx.tv:tv-material:1.0.0-alpha08")
     // dagger - hilt
     implementation("com.google.dagger:dagger-android:2.47")
@@ -216,7 +217,7 @@ dependencies {
     kapt("com.google.dagger:dagger-compiler:2.47")
     kapt("com.google.dagger:dagger-android-processor:2.47")
     kapt("com.google.dagger:hilt-compiler:2.47")
-    kapt("com.squareup.moshi:moshi-kotlin-codegen:1.15.0")
+    ksp("com.squareup.moshi:moshi-kotlin-codegen:1.15.0")
     // view model
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
     // navigation

+ 5 - 4
build.gradle.kts

@@ -7,10 +7,11 @@
  */
 
 plugins {
-    id("com.android.application") version "8.0.2" apply false
-    id("com.android.library") version "8.0.2" apply false
+    id("com.android.application") version "8.1.0" apply false
+    id("com.android.library") version "8.1.0" apply false
     kotlin("android") version "1.7.20" apply false
-    id("com.google.dagger.hilt.android") version "2.44" apply false
+    id("com.google.dagger.hilt.android") version "2.47" apply false
+    id("com.google.devtools.ksp") version "1.9.0-1.0.11" apply false
 }
 
 buildscript {
@@ -21,6 +22,6 @@ buildscript {
     dependencies {
         classpath("com.android.tools:r8:8.1.56")
         classpath("io.objectbox:objectbox-gradle-plugin:3.6.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
     }
 }

+ 1 - 0
buildSrc/build.gradle.kts

@@ -24,6 +24,7 @@ plugins {
 //    `java-gradle-plugin`
 //    `groovy-gradle-plugin`
 //    id("org.jetbrains.dokka") version "1.8.10"
+//    id("com.google.devtools.ksp")
 }
 
 dependencies {

+ 1 - 1
buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/MainAppPlugin.kt

@@ -62,7 +62,7 @@ abstract class MainAppPlugin : Plugin<Project> {
 
         val javaVersion: JavaVersion = JavaVersion.VERSION_17
 
-        const val kotlinCompilerExtVersion = "1.4.8"
+        const val kotlinCompilerExtVersion = "1.5.1"
 
         inline fun <reified T : Task> Project.registerTask(
             name: String,

+ 3 - 2
tvlib/build.gradle.kts

@@ -17,6 +17,7 @@ plugins {
     id("dagger.hilt.android.plugin")
 //    id("org.jetbrains.dokka") version "1.8.10"
     kotlin("kapt")
+    id("com.google.devtools.ksp")
 }
 
 android {
@@ -92,7 +93,7 @@ dependencies {
     // more icons
     implementation("androidx.compose.material:material-icons-extended:1.4.3")
     // tv compose
-    implementation("androidx.tv:tv-foundation:1.0.0-SNAPSHOT")
+    implementation("androidx.tv:tv-foundation:1.0.0-alpha08")
     implementation("androidx.tv:tv-material:1.0.0-alpha08")
     // paging
     implementation("androidx.paging:paging-compose:3.2.0")
@@ -106,7 +107,7 @@ dependencies {
     implementation("io.coil-kt:coil-svg:2.4.0")
     implementation("io.coil-kt:coil-video:2.4.0")
     implementation("io.coil-kt:coil-compose:2.4.0")
-    implementation("com.github.skydoves:landscapist-coil:2.2.2")
+    implementation("com.github.skydoves:landscapist-coil:2.2.5")
     // constraint layout // todo remove
     implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
     // debug