#35 [add] Add uri in settings.gradle.kts and Jetifier

BCSDLab · Jan 29, 2023 · cdf1744 · cdf1744
1 parent fa34927
commit cdf1744
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -24,7 +24,9 @@ android {
         buildConfigField("String", "naver_client_id", getPropertyKey("naver_client_id"))
         buildConfigField("String", "naver_client_secret", getPropertyKey("naver_client_secret"))
         buildConfigField("String", "naver_client_name", getPropertyKey("naver_client_name"))
+        buildConfigField("String", "naver_maps_client_id", getPropertyKey("naver_maps_client_id"))
         resValue("string", "kakao_oauth_host", getPropertyKey("kakao_oauth_host"))
+        resValue("string", "naver_maps_client_id", getPropertyKey("naver_maps_client_id"))
     }
 
     buildTypes {
@@ -61,6 +63,7 @@ dependencies {
     implementation("com.kakao.sdk:v2-user:2.11.0")
     implementation("com.google.android.gms:play-services-auth:20.3.0")
     implementation("com.navercorp.nid:oauth:5.1.1")
+
     KotlinDependencies.run {
         implementation(kotlin)
         implementation(coroutine)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.JJBAKSAAOS"
-        tools:targetApi="31">
+        tools:targetApi="31"
+        tools:replace="android:appComponentFactory"
+        android:appComponentFactory="whateverString">
         <activity
             android:name=".ui.findid.FindIdActivity"
             android:exported="false"/>
@@ -54,6 +56,9 @@
                     android:scheme="@string/kakao_oauth_host" />
             </intent-filter>
         </activity>
+        <meta-data
+            android:name="com.naver.maps.map.CLIENT_ID"
+            android:value="@string/naver_maps_client_id"/>
     </application>
 
 </manifest>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven("https://naver.jfrog.io/artifactory/maven/")
     }
     dependencies {
         classpath("com.android.tools.build:gradle:${Versions.gradleVersion}")

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+
+android.enableJetifier=true
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -13,6 +13,9 @@ dependencyResolutionManagement {
         maven {
             url = uri("https://devrepo.kakao.com/nexus/content/groups/public/")
         }
+        maven {
+            url = uri("https://naver.jfrog.io/artifactory/maven/")
+        }
     }
 }
 rootProject.name = "JJBAKSA"
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,9 @@ dependencyResolutionManagement { @@
             maven {
                 url = uri("https://devrepo.kakao.com/nexus/content/groups/public/")
             }
+            maven {
+                url = uri("https://naver.jfrog.io/artifactory/maven/")
+            }
         }
     }
     rootProject.name = "JJBAKSA"
@@ Expand Down @@