From 67ffc52ca27fe7667dfdb57a29e45bd03854ae84 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 20 Feb 2023 19:50:23 +0100 Subject: [PATCH] Upgrade gradle plugin --- app/build.gradle | 9 ++++++--- app/src/main/AndroidManifest.xml | 3 +-- build.gradle | 2 +- dmg2img/build.gradle | 1 + dmg2img/src/main/AndroidManifest.xml | 3 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1e83a16..5e364ba 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,12 +7,12 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 30 + compileSdkVersion 33 buildToolsVersion '29.0.3' defaultConfig { applicationId "eu.depau.etchdroid" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 13 versionName "1.5.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -31,7 +31,9 @@ android { } } packagingOptions { - exclude 'META-INF/libaums_release.kotlin_module' + resources { + excludes += ['META-INF/libaums_release.kotlin_module'] + } } compileOptions { encoding = 'UTF-8' @@ -41,6 +43,7 @@ android { lintOptions { abortOnError false } + namespace 'eu.depau.etchdroid' } dependencies { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3882c57..1cdb718 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/build.gradle b/build.gradle index 903d901..ab9966c 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // For libaums diff --git a/dmg2img/build.gradle b/dmg2img/build.gradle index 1ac0417..8d508f5 100644 --- a/dmg2img/build.gradle +++ b/dmg2img/build.gradle @@ -21,4 +21,5 @@ android { } } ndkVersion '21.0.6113669' + namespace 'org.eu.vu1tur.dmg2img' } \ No newline at end of file diff --git a/dmg2img/src/main/AndroidManifest.xml b/dmg2img/src/main/AndroidManifest.xml index dd279fd..c7e7078 100644 --- a/dmg2img/src/main/AndroidManifest.xml +++ b/dmg2img/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3f9ef27..6874df8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip