#9 update to kotlin 1.5.20 and gradle 0.7.2

.github/workflows/compilation-check.yml

@@ -12,9 +12,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Build and test
-        run: ./gradlew build publishToMavenLocal
+        run: ./gradlew build publishToMavenLocal syncMultiPlatformLibraryDebugFrameworkIosX64
+      - name: Install pods with kotlin
+        run: cd sample/ios-app && pod install
+      - name: build ios sample
+        run: cd sample/ios-app && xcodebuild -scheme TestProj -workspace TestProj.xcworkspace -configuration Debug -sdk iphonesimulator -arch x86_64 build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty

.github/workflows/publish.yml

@@ -21,10 +21,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: Publish library
         run: ./gradlew publish
   release:
@@ -40,6 +40,6 @@ jobs:
         with:
           commitish: ${{ github.ref }}
           tag_name: release/${{ github.event.inputs.version }}
-          release_name: Release ${{ github.event.inputs.version }}
+          release_name: ${{ github.event.inputs.version }}
           body: "Will be filled later"
           draft: true

README.md

@@ -1,4 +1,4 @@
-[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock.moko/javascript) ](https://repo1.maven.org/maven2/dev/icerock/moko/javascript) ![kotlin-version](https://img.shields.io/badge/kotlin-1.4.32-orange)
+[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock.moko/javascript) ](https://repo1.maven.org/maven2/dev/icerock/moko/javascript) ![kotlin-version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=dev.icerock.moko&name=javascript)
 
 # Mobile Kotlin javascript
 This is a Kotlin MultiPlatform library that allows you to run JavaScript code from common Kotlin code
@@ -22,10 +22,6 @@ This is a Kotlin MultiPlatform library that allows you to run JavaScript code fr
 - Android API 16+
 - iOS version 9.0+
 
-## Versions
-- kotlin 1.4.32
-  - 0.1.0
-
 ## Installation
 root build.gradle  
 ```groovy
@@ -39,17 +35,22 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:javascript:0.1.0")
+    commonMainApi("dev.icerock.moko:javascript:0.2.0")
 }
 ```
 
 ## Usage
 ```kotlin
 val javaScriptEngine = JavaScriptEngine()
-val result: JsType = javaScriptEngine.evaluate(
-  context = emptyMap(),
-  script = """ "Hello" + "World" """.trimIndent()
-)
+val result: JsType = try {
+  javaScriptEngine.evaluate(
+    context = emptyMap(),
+    script = """ "Hello" + "World" """.trimIndent()
+  )
+} catch (ex: JavaScriptEvaluationException) {
+  // Handle script evaluation error
+  JsType.Null
+}
 if (result is JsType.Str) {
     println(result.value)
 }
@@ -83,4 +84,4 @@ More detailed guide for contributers see in [contributing guide](CONTRIBUTING.md
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
-    limitations under the License.
+    limitations under the License.

build.gradle

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+buildscript {
+    repositories {
+        mavenCentral()
+        google()
+    }
+    dependencies {
+        classpath(":javascript-build-logic")
+    }
+}
+
+allprojects {
+    plugins.withId("org.gradle.maven-publish") {
+        group = "dev.icerock.moko"
+        version = libs.versions.mokoJavascriptVersion.get()
+    }
+}

gradle/libs.versions.toml

@@ -0,0 +1,29 @@
+[versions]
+kotlinTestVersion = "1.5.20"
+androidAppCompatVersion = "1.2.0"
+materialDesignVersion = "1.0.0"
+androidLifecycleVersion = "2.1.0"
+androidCoreTestingVersion = "1.3.0"
+testJUnitExtVersion = "1.1.2"
+quickjsVersion = "0.9.0"
+coroutinesVersion = "1.5.0-native-mt"
+kotlinxSerializationVersion = "1.1.0"
+mokoTestVersion = "0.4.0"
+mokoJavascriptVersion = "0.2.0"
+
+
+[libraries]
+appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
+material = { module = "com.google.android.material:material", version.ref = "materialDesignVersion" }
+lifecycle = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "androidLifecycleVersion" }
+kotlinTestJUnit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinTestVersion" }
+testRunner = { module = "androidx.test:runner", version.ref = "androidCoreTestingVersion" }
+testRules = { module = "androidx.test:rules", version.ref = "androidCoreTestingVersion" }
+testJUnitExt = { module = "androidx.test.ext:junit", version.ref = "testJUnitExtVersion" }
+testJUnitExtKtx = { module = "androidx.test.ext:junit-ktx", version.ref = "testJUnitExtVersion" }
+quickjs = { module = "app.cash.quickjs:quickjs-android", version.ref = "quickjsVersion" }
+coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutinesVersion" }
+kotlinSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationVersion" }
+kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlinTestVersion" }
+kotlinTestAnnotations =  { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlinTestVersion" }
+mokoTest = { module = "dev.icerock.moko:test-core", version.ref = "mokoTestVersion" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

javascript-build-logic/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+    google()
+
+    gradlePluginPortal()
+}
+
+dependencies {
+    api("dev.icerock:mobile-multiplatform:0.12.0")
+    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
+    api("com.android.tools.build:gradle:4.2.1")
+    api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")
+}

buildSrc/src/main/kotlin/android-app-convention.gradle.kts → javascript-build-logic/src/main/kotlin/android-app-convention.gradle.kts

@@ -1,18 +1,21 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
 plugins {
     id("com.android.application")
     id("android-base-convention")
+    id("kotlin-android")
 }
 
 android {
     dexOptions {
         javaMaxHeapSize = "2g"
     }
 
-    defaultConfig.vectorDrawables.useSupportLibrary = true
-
     buildTypes {
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
         getByName("debug") {
@@ -23,5 +26,7 @@ android {
 
     packagingOptions {
         exclude("META-INF/*.kotlin_module")
+        exclude("META-INF/AL2.0")
+        exclude("META-INF/LGPL2.1")
     }
 }

javascript-build-logic/src/main/kotlin/android-base-convention.gradle.kts

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import com.android.build.gradle.BaseExtension
+
+configure<BaseExtension> {
+    compileSdkVersion(30)
+
+    defaultConfig {
+        minSdkVersion(18)
+        targetSdkVersion(30)
+    }
+}

javascript-build-logic/src/main/kotlin/android-library-convention.gradle.kts

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("com.android.library")
+    id("kotlin-android")
+    id("android-base-convention")
+}
+
+android {
+    sourceSets.all { java.srcDir("src/$name/kotlin") }
+}

javascript-build-logic/src/main/kotlin/android-publication-convention.gradle.kts

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("publication-convention")
+}
+
+afterEvaluate {
+    publishing.publications {
+        create("release", MavenPublication::class.java) {
+            from(components.getByName("release"))
+        }
+    }
+}

javascript-build-logic/src/main/kotlin/detekt-convention.gradle.kts

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("io.gitlab.arturbosch.detekt")
+}
+
+detekt {
+    input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin", "src/main/kotlin")
+}
+
+dependencies {
+    "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.15.0")
+}

javascript-build-logic/src/main/kotlin/javadoc-stub-convention.gradle.kts

@@ -0,0 +1,16 @@
+/*
+ * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+plugins {
+    id("org.gradle.maven-publish")
+}
+
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+}
+
+publishing.publications.withType<MavenPublication> {
+    // Stub javadoc.jar artifact
+    artifact(javadocJar.get())
+}