update the gradle version

bytedeco · Mar 13, 2024 · c84d6a0 · c84d6a0
1 parent 7ecaa4b
commit c84d6a0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/gradle-javacpp-android/app/build.gradle b/gradle-javacpp-android/app/build.gradle
@@ -1,15 +1,16 @@
 plugins {
     id 'com.android.application'
-    id 'org.bytedeco.gradle-javacpp-build' version '1.5.4'
+    id 'org.bytedeco.gradle-javacpp-build' version '1.5.10'
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    namespace "com.example.myapplication"
+    compileSdk 34
+    buildToolsVersion = "34.0.0"
 
     defaultConfig {
         applicationId "com.example.myapplication"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
@@ -40,10 +41,10 @@ android {
     }
 }
 
-android.applicationVariants.all { variant ->
+android.applicationVariants.configureEach { variant ->
     def variantName = variant.name.capitalize() // either "Debug" or "Release"
-    def javaCompile = project.tasks.getByName("compile${variantName}JavaWithJavac")
-    def generateJson = project.tasks.getByName("generateJsonModel$variantName")
+    def javaCompile = project.tasks.named("compile${variantName}JavaWithJavac").get()
+    def generateJson = project.tasks.named("generateJsonModel$variantName").get()
 
     // Compiles NativeLibraryConfig.java
     task "javacppCompileJava$variantName"(type: JavaCompile) {
@@ -80,11 +81,11 @@ android.applicationVariants.all { variant ->
 }
 
 dependencies {
-    implementation 'org.bytedeco:javacpp:1.5.4'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'org.bytedeco:javacpp:1.5.10'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/gradle-javacpp-android/app/src/main/AndroidManifest.xml b/gradle-javacpp-android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.myapplication">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/gradle-javacpp-android/build.gradle b/gradle-javacpp-android/build.gradle
@@ -2,10 +2,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.1"
+        classpath "com.android.tools.build:gradle:8.3.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,10 +15,10 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
 }
diff --git a/gradle-javacpp-android/gradle/wrapper/gradle-wrapper.properties b/gradle-javacpp-android/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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip