From 93d9613e3e4fc0c1e2f88804776e23dabb457727 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Thu, 21 Jul 2022 14:49:47 +0200 Subject: [PATCH] Android Studio Chipmunk --- ChangeLogLib/build.gradle | 1 - build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- sample/build.gradle | 6 ++++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLogLib/build.gradle b/ChangeLogLib/build.gradle index 0acf181..4faa5a8 100644 --- 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 index 106b8bb..7f12b71 100644 --- 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 index 05679dc..2e6e589 100644 --- 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 index 6a9656b..59c5cfd 100644 --- 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 {