Android Studio Chipmunk

AppDevNext · Jul 21, 2022 · 93d9613 · 93d9613
1 parent b4dc63e
commit 93d9613
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/ChangeLogLib/build.gradle b/ChangeLogLib/build.gradle
@@ -8,7 +8,6 @@ android {
     compileSdkVersion 31
 
     defaultConfig {
-        versionName "1.0.0"
 
         minSdkVersion 17
         project.archivesBaseName = "ChangeLog"

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -11,10 +11,12 @@ android {
         minSdkVersion 17
         targetSdkVersion 31
     }
-
     packagingOptions {
-        pickFirst 'META-INF/atomicfu.kotlin_module'
+        resources {
+            pickFirsts += ['META-INF/atomicfu.kotlin_module']
+        }
     }
+
 }
 
 dependencies {