NR-157 Target sdk 버전을 36으로 변경

.gitignore

@@ -7,6 +7,7 @@ local.properties
 
 # Log/OS Files
 *.log
+.DS_Store
 
 # Android Studio generated files and folders
 captures/

app/build.gradle.kts

@@ -1,4 +1,4 @@
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+import java.util.Properties
 
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
@@ -83,5 +83,11 @@ dependencies {
 }
 
 fun getApiKey(propertyKey: String): String {
-    return gradleLocalProperties(rootDir).getProperty(propertyKey)
+    val localProperties = Properties().apply {
+        rootProject.file("local.properties")
+            .takeIf(File::exists)
+            ?.inputStream()
+            ?.use(::load)
+    }
+    return localProperties.getProperty(propertyKey)
 }

app/src/main/AndroidManifest.xml

@@ -22,6 +22,15 @@
         android:theme="@style/Theme.NextRoom"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+
+        <!--
+            targetSdk 36부터 Android 16은 sw600dp 이상 화면에서 orientation/resizability 제한을 무시한다.
+            현재 앱은 세로 전용 UI이므로 일시적으로 opt-out 한다. (targetSdk 37부터는 무시됨)
+        -->
+        <property
+            android:name="android.window.PROPERTY_COMPAT_ALLOW_RESTRICTED_RESIZABILITY"
+            android:value="true" />
+
         <activity
             android:name="com.nextroom.nextroom.presentation.ui.MainActivity"
             android:exported="true"

build.gradle.kts

@@ -17,8 +17,9 @@ plugins {
     alias(libs.plugins.firebase.crashlytics) apply false
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 task("clean", Delete::class) {
-    delete = setOf(rootProject.buildDir)
+    delete = setOf(rootProject.layout.buildDirectory)
 }

data/build.gradle.kts

@@ -1,4 +1,4 @@
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+import java.util.Properties
 
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
@@ -88,5 +88,11 @@ dependencies {
 }
 
 fun getApiKey(propertyKey: String): String {
-    return gradleLocalProperties(rootDir).getProperty(propertyKey)
+    val localProperties = Properties().apply {
+        rootProject.file("local.properties")
+            .takeIf(File::exists)
+            ?.inputStream()
+            ?.use(::load)
+    }
+    return localProperties.getProperty(propertyKey)
 }

gradle.properties

@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

gradle/libs.versions.toml

@@ -2,14 +2,14 @@
 minSdk = "24"
 review = "2.0.1"
 reviewKtx = "2.0.1"
-targetSdk = "35"
+targetSdk = "36"
 versionCode = "72"
 versionName = "1.6.1"
-compileSdk = "34"
+compileSdk = "36"
 targetJvm = "17"
-kotlin = "1.9.10"
-android = "8.1.2"
-ksp = "1.9.10-1.0.13"
+kotlin = "2.0.21"
+android = "8.9.3"
+ksp = "2.0.21-1.0.28"
 credentials = "1.2.2"
 credentials-auth = "1.2.2"
 google-identity = "1.1.0"
@@ -26,7 +26,7 @@ espresso = "3.5.1"
 firebase-bom = "32.3.1"
 coroutines = "1.7.3"
 glide = "4.14.2"
-hilt = "2.48"
+hilt = "2.52"
 hilt-navigation-fragment = "1.0.0"
 javax-inject = "1"
 timber = "5.0.1"
@@ -35,13 +35,13 @@ kotlinx-serialization-json = "1.5.1"
 logging-interceptor = "4.11.0"
 lottie = "6.1.0"
 material = "1.10.0"
-navigation = "2.7.4"
+navigation = "2.8.5"
 orbit = "6.0.0"
 recyclerview = "1.3.1"
 retrofit = "2.9.0"
-room = "2.5.2"
-google-services = "4.4.0"
-firebase-crashlytics = "2.9.9"
+room = "2.6.1"
+google-services = "4.4.2"
+firebase-crashlytics = "3.0.2"
 billing = "8.0.0"
 firebase-config = "21.6.0"
 firebase-analytics="22.1.2"
@@ -138,6 +138,7 @@ google-services = { id = "com.google.gms.google-services", version.ref = "google
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 [bundles]
 coroutines = ["kotlinx-coroutines-core", "kotlinx-coroutines-core-jvm", "kotlinx-coroutines-android"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Wed Sep 06 15:10:03 KST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists