Skip to content

Commit

Permalink
Updating samples' dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
gershnik committed Dec 1, 2022
1 parent 65c14e3 commit e94d95c
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 38 deletions.
14 changes: 7 additions & 7 deletions samples/android/java/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ dependencies {
//JNI code generator
annotationProcessor("io.github.gershnik:smjni-jnigen-processor:${gradle.ext.jniGenVersion}")

implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.6.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
}


Expand Down Expand Up @@ -110,10 +110,10 @@ clean.dependsOn cleanJNIHeaders
tasks.whenTaskAdded { theTask ->
def match = theTask.name =~ ~/^buildCMake([^\[]*).*$/
if (match) {
def config;
def config
switch(match.group(1)) {
case "RelWithDebInfo": config = "Release"; break
default: config = match.group(1); break;
default: config = match.group(1); break
}
theTask.dependsOn "compile${config}JavaWithJavac"
}
Expand Down
2 changes: 1 addition & 1 deletion samples/android/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.0'
classpath 'com.android.tools.build:gradle:7.3.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions samples/android/java/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Oct 05 09:18:42 PDT 2021
#Wed Nov 30 19:18:56 PST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
16 changes: 8 additions & 8 deletions samples/android/kotlin-kapt/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ dependencies {
//JNI code generator
kapt("io.github.gershnik:smjni-jnigen-processor:${gradle.ext.jniGenVersion}")

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'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
}

android {
Expand Down Expand Up @@ -109,10 +109,10 @@ clean.dependsOn cleanJNIHeaders
tasks.whenTaskAdded { theTask ->
def match = theTask.name =~ ~/^buildCMake([^\[]*).*$/
if (match) {
def config;
def config
switch(match.group(1)) {
case "RelWithDebInfo": config = "Release"; break
default: config = match.group(1); break;
default: config = match.group(1); break
}
theTask.dependsOn "kapt${config}Kotlin"
}
Expand Down
4 changes: 2 additions & 2 deletions samples/android/kotlin-kapt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:7.2.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
classpath "com.android.tools.build:gradle:7.3.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Oct 06 03:14:36 PDT 2021
#Wed Nov 30 19:18:56 PST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
18 changes: 9 additions & 9 deletions samples/android/kotlin-ksp/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'com.google.devtools.ksp' version "1.6.21-1.0.5"
id 'com.google.devtools.ksp' version "1.7.20-1.0.8"
}

//JniGen settings
Expand All @@ -18,13 +18,13 @@ dependencies {
//JNI code generator
ksp("io.github.gershnik:smjni-jnigen-kprocessor:${gradle.ext.jniGenVersion}")

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'
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
}

android {
Expand Down Expand Up @@ -106,10 +106,10 @@ clean.dependsOn cleanJNIHeaders
tasks.whenTaskAdded { theTask ->
def match = theTask.name =~ ~/^buildCMake([^\[]*).*$/
if (match) {
def config;
def config
switch(match.group(1)) {
case "RelWithDebInfo": config = "Release"; break
default: config = match.group(1); break;
default: config = match.group(1); break
}
theTask.dependsOn "ksp${config}Kotlin"
}
Expand Down
4 changes: 2 additions & 2 deletions samples/android/kotlin-ksp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:7.2.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
classpath "com.android.tools.build:gradle:7.3.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Oct 07 05:21:41 PDT 2021
#Wed Nov 30 19:18:56 PST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
6 changes: 3 additions & 3 deletions samples/common.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
gradle.ext.jniGenVersion = '3.6'
gradle.ext.cmakeVersion = '3.18.1'
gradle.ext.compileSdk = 32
gradle.ext.cmakeVersion = '3.22.1'
gradle.ext.compileSdk = 33
gradle.ext.minSdk = 21
gradle.ext.targetSdk = 32
gradle.ext.targetSdk = 33

0 comments on commit e94d95c

Please sign in to comment.