diff --git a/shell/android-studio/build.gradle b/shell/android-studio/build.gradle index 905d3bd2f..a550ce3b9 100644 --- a/shell/android-studio/build.gradle +++ b/shell/android-studio/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.1.3' apply false - id 'com.android.library' version '7.1.3' apply false + id 'com.android.application' version '7.2.1' apply false + id 'com.android.library' version '7.2.1' apply false } task clean(type: Delete) { diff --git a/shell/android-studio/flycast/build.gradle b/shell/android-studio/flycast/build.gradle index ada91a950..e7860dcbc 100644 --- a/shell/android-studio/flycast/build.gradle +++ b/shell/android-studio/flycast/build.gradle @@ -12,12 +12,12 @@ def getVersionName = { -> } android { - compileSdkVersion 29 + compileSdk 29 defaultConfig { applicationId "com.flycast.emulator" - minSdkVersion 16 - targetSdkVersion 29 + minSdk 16 + targetSdk 29 versionCode 8 versionName getVersionName() vectorDrawables.useSupportLibrary = true diff --git a/shell/android-studio/gradle.properties b/shell/android-studio/gradle.properties index c09e1e3b0..d5e8af31a 100644 --- a/shell/android-studio/gradle.properties +++ b/shell/android-studio/gradle.properties @@ -15,3 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # Android operating system, and which are packaged with your app"s APK # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true +# 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 diff --git a/shell/android-studio/gradle/wrapper/gradle-wrapper.properties b/shell/android-studio/gradle/wrapper/gradle-wrapper.properties index d3e86fc2b..7dede072c 100644 --- a/shell/android-studio/gradle/wrapper/gradle-wrapper.properties +++ b/shell/android-studio/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Feb 26 14:15:04 CET 2022 +#Sat Jun 04 09:36:24 CEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME