diff options
| author | Wolfgang Schupp <wsnipex@a1.net> | 2023-02-08 07:59:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-08 07:59:59 +0100 |
| commit | 6d04737c86b426350398d03d40b9bd058bd73c2e (patch) | |
| tree | 6efe26fd12fb0f21ddcf23f93aa1431caae6398a | |
| parent | bd9b2fae9908fac6f45ee0b87d84f8f8dc4358e8 (diff) | |
| parent | 52df4bd16cb5612f3bd34fc3aad67d5de6937b12 (diff) | |
Merge pull request #22687 from joseluismarti/update-gradle
[Android] bump Gradle and Android Gradle Plugin
4 files changed, 3 insertions, 3 deletions
diff --git a/tools/android/packaging/build.gradle b/tools/android/packaging/build.gradle index b0d1b5b13d..6c30dfffc8 100644 --- a/tools/android/packaging/build.gradle +++ b/tools/android/packaging/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/tools/android/packaging/gradle/wrapper/gradle-wrapper.properties b/tools/android/packaging/gradle/wrapper/gradle-wrapper.properties index 28adbd590c..485dbe3364 100644 --- a/tools/android/packaging/gradle/wrapper/gradle-wrapper.properties +++ b/tools/android/packaging/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml.in b/tools/android/packaging/xbmc/AndroidManifest.xml.in index 4df0b0bdd3..aad52556b7 100644 --- a/tools/android/packaging/xbmc/AndroidManifest.xml.in +++ b/tools/android/packaging/xbmc/AndroidManifest.xml.in @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?><!-- BEGIN_INCLUDE(manifest) --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="@APP_PACKAGE@" android:installLocation="auto" android:versionCode="@APP_VERSION_CODE_ANDROID@" android:versionName="@APP_VERSION@"> diff --git a/tools/android/packaging/xbmc/build.gradle.in b/tools/android/packaging/xbmc/build.gradle.in index de8cf47c4a..12019f4089 100644 --- a/tools/android/packaging/xbmc/build.gradle.in +++ b/tools/android/packaging/xbmc/build.gradle.in @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' android { + namespace '@APP_PACKAGE@' compileSdkVersion @TARGET_SDK@ ndkPath "@NDKROOT@" defaultConfig { |