chaquopy version 으로 인한 videoPlayer issue 수정

jhg3410 · Nov 11, 2024 · 40bcf0f · 40bcf0f
1 parent 12d4b9d
commit 40bcf0f
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 47 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,9 +1,9 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.kapt)
-    id(libs.plugins.hilt.plugin.get().pluginId)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.hilt.android)
 }
 
 android {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,15 +1,10 @@
-@file:Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.kapt) apply false
+    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.hilt.android) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.chaquopy) apply false
-}
-
-buildscript {
-    dependencies {
-        classpath(libs.hilt.plugin)
-    }
 }
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)

diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
@@ -1,7 +1,7 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {

diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)

diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -1,6 +1,5 @@
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -20,7 +19,7 @@ android {
         buildConfigField(
             type = "String",
             name = "TMDB_API_KEY",
-            value = gradleLocalProperties(rootDir).getProperty("TMDB_API_KEY")
+            value = gradleLocalProperties(rootDir, providers).getProperty("TMDB_API_KEY")
         )
     }
 

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -1,7 +1,7 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {

diff --git a/feature/detail/build.gradle.kts b/feature/detail/build.gradle.kts
@@ -1,9 +1,9 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.kapt)
-    id("dagger.hilt.android.plugin")
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.hilt.android)
 }
 
 android {

diff --git a/feature/home/build.gradle.kts b/feature/home/build.gradle.kts
@@ -1,9 +1,9 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.kapt)
-    id("dagger.hilt.android.plugin")
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.hilt.android)
 }
 
 

diff --git a/feature/popular/build.gradle.kts b/feature/popular/build.gradle.kts
@@ -1,9 +1,9 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.kapt)
-    id("dagger.hilt.android.plugin")
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.hilt.android)
 }
 
 android {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,32 +1,31 @@
 [versions]
-kotlin = "1.8.10"
+kotlin = "2.0.21"
 
 ktx = "1.13.1"
-runtime-ktx = "2.8.4"
-compose = "1.6.8"
-compose-activity = "1.9.1"
+runtime-ktx = "2.8.7"
+compose = "1.7.5"
+compose-activity = "1.9.3"
 compose-navigation = "2.7.0-alpha01"
 accompanist = "0.32.0"
 material3 = "1.2.1"
 junit = "4.13.2"
-ext-junit = "1.1.5"
-espresso = "3.5.1"
-moshi = "1.14.0"
-coil = "2.4.0"
-timber = "5.0.1"
-lifecycle = "2.8.4"
-coroutines = "1.7.3"
-hilt = "2.48.1"
+ext-junit = "1.2.1"
+espresso = "3.6.1"
+moshi = "1.15.1"
+coil = "2.7.0"
+lifecycle = "2.8.7"
+coroutines = "1.9.0"
+hilt = "2.52"
 hilt-navigation = "1.2.0"
-retrofit = "2.9.0"
+retrofit = "2.11.0"
 logging-interceptor = "4.12.0"
-ksp = "1.8.10-1.0.9"
+ksp = "2.0.21-1.0.25"
 splashscreen = "1.0.1"
-media3 = "1.4.0"
-chaquopy = "15.0.1"
+media3 = "1.4.1"
+chaquopy = "16.0.0"
 palette = "1.0.0"
 
-androidGradlePlugin = "8.1.4"
+androidGradlePlugin = "8.6.1"
 
 [libraries]
 androidx-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "ktx" }
@@ -70,13 +69,9 @@ moshi-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.re
 # coil
 compose-coil = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
 
-# Timer
-timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" }
-
 # Hilt
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
 hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
-hilt-plugin = { module = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" }
 hilt-navigation = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hilt-navigation" }
 
 # Retrofit
@@ -101,6 +96,7 @@ android-application = { id = "com.android.application", version.ref = "androidGr
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
-hilt-plugin = { id = "dagger.hilt.android.plugin", version.ref = "hilt" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 chaquopy = { id = "com.chaquo.python", version.ref = "chaquopy" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 03 00:52:43 KST 2023
+#Mon Nov 11 19:22:14 KST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/lib/videoplayer/build.gradle.kts b/lib/videoplayer/build.gradle.kts
@@ -1,7 +1,7 @@
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
     alias(libs.plugins.chaquopy)
 }