Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/publish-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -19,7 +19,7 @@ kotlin {
jvm {
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_11.toString()
}
}
testRuns["test"].executionTask.configure { useJUnit() }
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -26,6 +26,6 @@
},
"homepage": "https://github.com/GitLiveApp/kotlin-diff-utils#readme",
"dependencies": {
"kotlin": "1.5.32"
"kotlin": "1.6.10"
}
}