Updating samples' dependencies

gershnik · May 18, 2022 · 82213d2 · 82213d2
1 parent d023701
commit 82213d2
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 32 deletions.
diff --git a/samples/android/java/app/build.gradle b/samples/android/java/app/build.gradle
@@ -16,9 +16,9 @@ dependencies {
     //JNI code generator
     annotationProcessor("io.github.gershnik:smjni-jnigen-processor:${gradle.ext.jniGenVersion}")
 
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
@@ -27,6 +27,7 @@ dependencies {
 
 android {
     compileSdk gradle.ext.compileSdk
+    namespace 'com.example.myapplication'
 
     defaultConfig {
         applicationId "com.example.myapplication"
@@ -107,7 +108,7 @@ clean.dependsOn cleanJNIHeaders
 
 //Make Java compilation (and JniGen code generation) run before CMake build
 tasks.whenTaskAdded { theTask ->
-    def match = theTask.name =~ ~/^buildCMake(.*)$/
+    def match = theTask.name =~ ~/^buildCMake([^\[]*).*$/
     if (match) {
         def config;
         switch(match.group(1)) {

diff --git a/samples/android/java/app/src/main/AndroidManifest.xml b/samples/android/java/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/samples/android/java/build.gradle b/samples/android/java/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
+        classpath 'com.android.tools.build:gradle:7.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/samples/android/java/gradle/wrapper/gradle-wrapper.properties b/samples/android/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Oct 05 09:18:42 PDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/samples/android/kotlin-kapt/app/build.gradle b/samples/android/kotlin-kapt/app/build.gradle
@@ -18,17 +18,18 @@ dependencies {
     //JNI code generator
     kapt("io.github.gershnik:smjni-jnigen-processor:${gradle.ext.jniGenVersion}")
 
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 
 android {
     compileSdk gradle.ext.compileSdk
+    namespace 'com.example.myapplication'
 
     defaultConfig {
         applicationId "com.example.myapplication"
@@ -106,7 +107,7 @@ clean.dependsOn cleanJNIHeaders
 
 //Make KAPT (and so JniGen code generation) run before CMake build
 tasks.whenTaskAdded { theTask ->
-    def match = theTask.name =~ ~/^buildCMake(.*)$/
+    def match = theTask.name =~ ~/^buildCMake([^\[]*).*$/
     if (match) {
         def config;
         switch(match.group(1)) {

diff --git a/samples/android/kotlin-kapt/app/src/main/AndroidManifest.xml b/samples/android/kotlin-kapt/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/samples/android/kotlin-kapt/build.gradle b/samples/android/kotlin-kapt/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31"
+        classpath "com.android.tools.build:gradle:7.2.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/samples/android/kotlin-kapt/gradle/wrapper/gradle-wrapper.properties b/samples/android/kotlin-kapt/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Oct 06 03:14:36 PDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/samples/android/kotlin-ksp/app/build.gradle b/samples/android/kotlin-ksp/app/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'com.google.devtools.ksp' version "1.5.31-1.0.0"
+    id 'com.google.devtools.ksp' version "1.6.21-1.0.5"
 }
 
 //JniGen settings
@@ -18,17 +18,18 @@ dependencies {
     //JNI code generator
     ksp("io.github.gershnik:smjni-jnigen-kprocessor:${gradle.ext.jniGenVersion}")
 
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 
 android {
     compileSdk gradle.ext.compileSdk
+    namespace 'com.example.myapplication'
 
     defaultConfig {
         applicationId "com.example.myapplication"
@@ -103,7 +104,7 @@ clean.dependsOn cleanJNIHeaders
 
 //Make KSP (and so JniGen code generation) run before CMake build
 tasks.whenTaskAdded { theTask ->
-    def match = theTask.name =~ ~/^buildCMake(.*)$/
+    def match = theTask.name =~ ~/^buildCMake([^\[]*).*$/
     if (match) {
         def config;
         switch(match.group(1)) {

diff --git a/samples/android/kotlin-ksp/app/src/main/AndroidManifest.xml b/samples/android/kotlin-ksp/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/samples/android/kotlin-ksp/build.gradle b/samples/android/kotlin-ksp/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.2"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31"
+        classpath "com.android.tools.build:gradle:7.2.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/samples/android/kotlin-ksp/gradle/wrapper/gradle-wrapper.properties b/samples/android/kotlin-ksp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Oct 07 05:21:41 PDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/samples/common.gradle b/samples/common.gradle
@@ -1,5 +1,5 @@
 gradle.ext.jniGenVersion = '3.5'
 gradle.ext.cmakeVersion = '3.18.1'
-gradle.ext.compileSdk = 30
+gradle.ext.compileSdk = 32
 gradle.ext.minSdk = 21
-gradle.ext.targetSdk = 30
+gradle.ext.targetSdk = 32
diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
@@ -11,7 +11,7 @@ project("myapplication")
 #Fetch SimpleJNI library
 FetchContent_Declare(SimpleJNI
         GIT_REPOSITORY [email protected]:gershnik/SimpleJNI.git
-        GIT_TAG 5e57c0ae
+        GIT_TAG d0237019cc0353f6c7508ba8a1e6d87ec5d90978
         GIT_SHALLOW TRUE
 )
 FetchContent_MakeAvailable(SimpleJNI)