From 56bc1ac65363cb9390b1c2fa9192d70e3e33b91f Mon Sep 17 00:00:00 2001 From: "Sue N. Cooper" Date: Sat, 5 Aug 2023 17:39:51 +0300 Subject: [PATCH] upgrade agp to 8.1.0 --- android/build.gradle | 2 +- android/ffmpeg-kit-android-lib/build.gradle | 8 +++++--- android/gradle/wrapper/gradle-wrapper.properties | 2 +- tools/android/build.gradle | 8 +++++--- tools/android/build.lts.gradle | 8 +++++--- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d257e48..252492e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' + classpath 'com.android.tools.build:gradle:8.1.0' } } diff --git a/android/ffmpeg-kit-android-lib/build.gradle b/android/ffmpeg-kit-android-lib/build.gradle index 2917a43..4205879 100644 --- a/android/ffmpeg-kit-android-lib/build.gradle +++ b/android/ffmpeg-kit-android-lib/build.gradle @@ -1,7 +1,9 @@ apply plugin: 'com.android.library' android { - namespace 'com.arthenica.ffmpegkit' + if (project.android.hasProperty("namespace")) { + namespace 'com.arthenica.ffmpegkit' + } compileSdk 33 ndkVersion "22.1.7171670" @@ -51,6 +53,6 @@ task javadoc(type: Javadoc) { dependencies { api 'com.arthenica:smart-exception-java:0.2.1' - testImplementation "androidx.test.ext:junit:1.1.3" - testImplementation 'org.json:json:20220320' + testImplementation "androidx.test.ext:junit:1.1.5" + testImplementation 'org.json:json:20230618' } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ae04661..84a0b92 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/tools/android/build.gradle b/tools/android/build.gradle index 2917a43..4205879 100644 --- a/tools/android/build.gradle +++ b/tools/android/build.gradle @@ -1,7 +1,9 @@ apply plugin: 'com.android.library' android { - namespace 'com.arthenica.ffmpegkit' + if (project.android.hasProperty("namespace")) { + namespace 'com.arthenica.ffmpegkit' + } compileSdk 33 ndkVersion "22.1.7171670" @@ -51,6 +53,6 @@ task javadoc(type: Javadoc) { dependencies { api 'com.arthenica:smart-exception-java:0.2.1' - testImplementation "androidx.test.ext:junit:1.1.3" - testImplementation 'org.json:json:20220320' + testImplementation "androidx.test.ext:junit:1.1.5" + testImplementation 'org.json:json:20230618' } diff --git a/tools/android/build.lts.gradle b/tools/android/build.lts.gradle index f33b028..8e184d6 100644 --- a/tools/android/build.lts.gradle +++ b/tools/android/build.lts.gradle @@ -1,7 +1,9 @@ apply plugin: 'com.android.library' android { - namespace 'com.arthenica.ffmpegkit' + if (project.android.hasProperty("namespace")) { + namespace 'com.arthenica.ffmpegkit' + } compileSdk 33 ndkVersion "22.1.7171670" @@ -51,6 +53,6 @@ task javadoc(type: Javadoc) { dependencies { api 'com.arthenica:smart-exception-java:0.2.1' - testImplementation "androidx.test.ext:junit:1.1.3" - testImplementation 'org.json:json:20220320' + testImplementation "androidx.test.ext:junit:1.1.5" + testImplementation 'org.json:json:20230618' }