Merge pull request #32 from portto/feature/upgrade_agp

Upgrade AGP to 8.0
blocto · May 16, 2023 · d295281 · d295281
2 parents baf81c1 + 63f6cc9
commit d295281
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -97,9 +97,9 @@ dependencies {
         exclude module: 'bcprov-jdk15on'
     }
 
-    implementation("com.nftco:flow-jvm-sdk:0.7.1") {
+    implementation("com.nftco:flow-jvm-sdk:0.7.3") {
         exclude module: 'bcprov-jdk15on'
     }
-    implementation("io.grpc:grpc-okhttp:1.47.0")
+    implementation("io.grpc:grpc-okhttp:1.50.2")
     implementation platform("com.google.firebase:firebase-bom:29.3.1")
 }
diff --git a/build.gradle b/build.gradle
@@ -7,9 +7,9 @@ buildscript {
     }
 }
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
+    id 'com.android.application' version '8.0.1' apply false
+    id 'com.android.library' version '8.0.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.21'
 }
 task clean(type: Delete) {

diff --git a/core/src/main/java/com/portto/sdk/core/BloctoApi.kt b/core/src/main/java/com/portto/sdk/core/BloctoApi.kt
@@ -1,7 +1,6 @@
 package com.portto.sdk.core
 
 import androidx.annotation.WorkerThread
-import androidx.viewbinding.BuildConfig
 import com.portto.sdk.core.BloctoApi.toErrorCode
 import com.portto.sdk.core.BuildConfig.VERSION_NAME
 import kotlinx.serialization.decodeFromString

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -4,17 +4,17 @@ ext.versions = [
         versionCode         : 5,
         versionName         : '0.4.0',
 
-        androidx_activity   : '1.6.1',
+        androidx_activity   : '1.7.1',
         androidx_appcompat  : '1.6.1',
         androidx_browser    : '1.5.0',
-        androidx_core       : '1.9.0',
-        androidx_fragment   : '1.5.3',
-        androidx_lifecycle  : '2.5.1',
+        androidx_core       : '1.10.1',
+        androidx_fragment   : '1.5.7',
+        androidx_lifecycle  : '2.6.1',
         androidx_viewmodel  : '2.4.1',
         androidx_constraint : '2.1.4',
         coroutine           : '1.6.4',
         flow_sdk            : '0.7.1',
-        material            : '1.8.0',
+        material            : '1.9.0',
         okhttp              : '4.10.0',
         serialization       : '1.3.2',
         timber              : '5.0.1',

diff --git a/gradle.properties b/gradle.properties
@@ -21,7 +21,8 @@ kotlin.code.style=official
 # 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.disableAutomaticComponentCreation=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
 
 SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Mar 09 10:37:29 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME