Merge pull request #69 from godmodelabs/update-kotlin-version

update kotlin to 1.7.0
godmodelabs · Mar 22, 2023 · 6fc8b8a · 6fc8b8a
2 parents 108f7a8 + 17b92e5
commit 6fc8b8a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.7.0'
     repositories {
         mavenCentral()
         google()
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -36,11 +36,20 @@ android {
             stl 'c++_static'
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+//    kotlin {
+//        jvmToolchain(8)
+//    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
@@ -52,7 +61,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: '*.jar')
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
-    compileOnly "androidx.annotation:annotation:1.5.0"
+    compileOnly "androidx.annotation:annotation:1.6.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     kapt project(path: ':ejecta-v8:v8annotations-compiler')
     api project(path: ':ejecta-v8:v8annotations')

diff --git a/gradle/wrapper/gradle-wrapper.properties b/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-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
diff --git a/src/main/java/ag/boersego/bgjs/modules/BGJSModuleAjaxRequest.kt b/src/main/java/ag/boersego/bgjs/modules/BGJSModuleAjaxRequest.kt
@@ -214,6 +214,9 @@ class BGJSModuleAjaxRequest(engine: V8Engine) : JNIV8Object(engine), Runnable {
                     cb.second.callAsV8Function(returnObject, errorCode, info)
                 type ->
                     cb.second.callAsV8Function(returnObject, info, details)
+                else                -> {
+                    // do nothing
+                }
             }
         }
         callbacks.clear()