Merge pull request #26 from GitLiveApp/1.6.21

1.6.10

Author: michaelprichardson

.github/workflows/publish-master.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v1
-      
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+
+      - uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 11
 
       - name: Change package version
         uses: eskatos/gradle-command-action@v1

.github/workflows/pull_request.yml

@@ -7,10 +7,11 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+
+      - uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: 11
 
       - name: Short SHA
         env:
@@ -19,13 +20,13 @@ jobs:
 
       - name: Read version
         id: read_version
-        uses: reedyuk/read-properties@v1.0.0
+        uses: reedyuk/read-properties@v1.0.1
         with:
           path: 'gradle.properties'
           property: 'version'
 
       - name: Update version
-        uses: reedyuk/write-properties@v1.0.0
+        uses: reedyuk/write-properties@v1.0.1
         with:
           path: 'gradle.properties'
           property: 'version'

build.gradle.kts

@@ -6,7 +6,7 @@ version = project.property("version") as String
 plugins {
     `maven-publish`
     signing
-    kotlin("multiplatform") version "1.5.32"
+    kotlin("multiplatform") version "1.6.10"
 }
 
 repositories {
@@ -19,7 +19,7 @@ kotlin {
     jvm {
         compilations.all {
             kotlinOptions {
-                jvmTarget = "1.8"
+                jvmTarget = JavaVersion.VERSION_11.toString()
             }
         }
         testRuns["test"].executionTask.configure { useJUnit() }

gradle.properties

@@ -1,6 +1,6 @@
-version=4.11.6-0fd38db
-kotlin_version=1.5.32
-kotlinx-coroutines.version=1.5.2
+version=4.11.7-0fd38db
+kotlin_version=1.6.10
+kotlinx-coroutines.version=1.6.0
 
 kotlin.code.style=official
 kotlin.incremental.multiplatform=true

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@gitliveapp/kotlin-diff-utils",
+  "name": "@gitliveapp/kotlin-diff-utils-js-legacy",
   "version": "0",
   "description": "The DiffUtils library for computing diffs, applying patches, generating side-by-side view in Java.",
   "main": "kotlin-diff-utils-js-legacy.js",
@@ -26,6 +26,6 @@
   },
   "homepage": "https://github.com/GitLiveApp/kotlin-diff-utils#readme",
   "dependencies": {
-    "kotlin": "1.5.32"
+    "kotlin": "1.6.10"
   }
 }