From cb75f78a1b187612069617c6917d1840bcc5262b Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Wed, 19 May 2021 17:38:37 +0300 Subject: [PATCH 01/13] Version updates ### What's done: * Koltin 1.5 * Others --- buildSrc/build.gradle.kts | 6 +++--- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- gradle.properties | 8 ++++++-- save-plugins/fix-plugin/build.gradle.kts | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index d89d696dc..0d11be2f8 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -7,9 +7,9 @@ repositories { } dependencies { - implementation("org.cqfn.diktat:diktat-gradle-plugin:0.5.1") - implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.16.0") - runtimeOnly(kotlin("gradle-plugin", "1.4.32")) + implementation("org.cqfn.diktat:diktat-gradle-plugin:0.5.3") + implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.17.0") + runtimeOnly(kotlin("gradle-plugin", "1.5.0")) implementation("io.github.gradle-nexus:publish-plugin:1.1.0") implementation("org.ajoberstar.reckon:reckon-gradle:0.13.0") implementation("com.squareup:kotlinpoet:1.8.0") diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 3173f7767..0f9ff0678 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,8 +1,8 @@ @file:Suppress("PACKAGE_NAME_MISSING", "CONSTANT_UPPERCASE") object Versions { - const val kotlin = "1.4.32" - const val junit = "5.7.1" + const val kotlin = "1.5.0" + const val junit = "5.7.2" const val okio = "3.0.0-alpha.1" const val ktoml = "0.2.1" diff --git a/gradle.properties b/gradle.properties index 8518d219d..c42240f18 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,11 @@ group=org.cqfn.save -kotlin.code.style=official -kotlin.mpp.stability.nowarn=true + # gradle performance org.gradle.parallel=true org.gradle.vfs.watch=true org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m + +# Kotlin +kotlin.code.style=official +kotlin.mpp.stability.nowarn=true +kotlin.native.cacheKind.linuxX64=static \ No newline at end of file diff --git a/save-plugins/fix-plugin/build.gradle.kts b/save-plugins/fix-plugin/build.gradle.kts index f254b970d..2b8342287 100644 --- a/save-plugins/fix-plugin/build.gradle.kts +++ b/save-plugins/fix-plugin/build.gradle.kts @@ -20,7 +20,7 @@ kotlin { val commonMain by getting { dependencies { implementation(project(":save-common")) - implementation("io.github.petertrr:kotlin-multiplatform-diff:0.1.0") + implementation("io.github.petertrr:kotlin-multiplatform-diff:0.2.0") } } val commonTest by getting { From 03f66de1e7c51ef73915f7c771d74c3fd9bc8d25 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Wed, 19 May 2021 17:50:38 +0300 Subject: [PATCH 02/13] Version updates ### What's done: * Koltin 1.5 * Others --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 0d11be2f8..5f0a1c4b7 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -8,7 +8,7 @@ repositories { dependencies { implementation("org.cqfn.diktat:diktat-gradle-plugin:0.5.3") - implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.17.0") + implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.16.0") runtimeOnly(kotlin("gradle-plugin", "1.5.0")) implementation("io.github.gradle-nexus:publish-plugin:1.1.0") implementation("org.ajoberstar.reckon:reckon-gradle:0.13.0") From 76c9d21b24ee088ae97335b8e5f37c64de3828d6 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Wed, 19 May 2021 17:54:50 +0300 Subject: [PATCH 03/13] Version updates ### What's done: * Koltin 1.5 * Others --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 0f9ff0678..5fdb31d73 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -4,7 +4,7 @@ object Versions { const val kotlin = "1.5.0" const val junit = "5.7.2" const val okio = "3.0.0-alpha.1" - const val ktoml = "0.2.1" + const val ktoml = "0.2.4" object Kotlinx { const val serialization = "1.1.0" From b95ebb9a013284c743dcfff4f35dc4f3f364823e Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Wed, 19 May 2021 18:09:23 +0300 Subject: [PATCH 04/13] Version updates ### What's done: * Koltin 1.5 * Others --- .github/workflows/build_and_test.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 5200aa7fb..591ae6d85 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -33,15 +33,16 @@ jobs: - name: Gradle build with remote cache uses: burrunan/gradle-cache-action@v1 with: - arguments: | - build - -x detekt properties: | org.gradle.caching=true gradle-version: wrapper # additional files to calculate key for dependency cache gradle-dependencies-cache-key: | buildSrc/**/Versions.kt + - name: Run gradle command + run: | + chmod +x gradlew + ./gradlew build -x detekt | sed 's/error:/e:/' - name: Upload gradle reports if: ${{ always() }} uses: actions/upload-artifact@v2 From 11cecd03d62830e98af459147fdbf6065afe0d73 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Wed, 19 May 2021 18:15:42 +0300 Subject: [PATCH 05/13] Version updates ### What's done: * Koltin 1.5 * Others --- .github/workflows/build_and_test.yml | 2 +- buildSrc/src/main/kotlin/Versions.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 591ae6d85..9f8e1f2e5 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -42,7 +42,7 @@ jobs: - name: Run gradle command run: | chmod +x gradlew - ./gradlew build -x detekt | sed 's/error:/e:/' + ./gradlew build -x detekt 2>&1 | sed 's/error:/e:/' - name: Upload gradle reports if: ${{ always() }} uses: actions/upload-artifact@v2 diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 5fdb31d73..013ce7205 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -6,6 +6,7 @@ object Versions { const val okio = "3.0.0-alpha.1" const val ktoml = "0.2.4" + // kek wait object Kotlinx { const val serialization = "1.1.0" const val datetime = "0.1.1" From bd6b5ea604caf2510504b28cea4523c82749148f Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Wed, 19 May 2021 18:20:41 +0300 Subject: [PATCH 06/13] Version updates ### What's done: * Koltin 1.5 * Others --- .github/workflows/build_and_test.yml | 2 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 9f8e1f2e5..a0c12796f 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -42,7 +42,7 @@ jobs: - name: Run gradle command run: | chmod +x gradlew - ./gradlew build -x detekt 2>&1 | sed 's/error:/e:/' + ./gradlew build -x detekt - name: Upload gradle reports if: ${{ always() }} uses: actions/upload-artifact@v2 diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 013ce7205..43184034a 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -6,7 +6,7 @@ object Versions { const val okio = "3.0.0-alpha.1" const val ktoml = "0.2.4" - // kek wait + // kek waitttt object Kotlinx { const val serialization = "1.1.0" const val datetime = "0.1.1" From f6ccb5241deba56d2e5d839cd598e9243120c02b Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Wed, 19 May 2021 18:35:47 +0300 Subject: [PATCH 07/13] Version updates ### What's done: * Koltin 1.5 * Others --- .github/workflows/build_and_test.yml | 8 ++++---- .github/workflows/detekt.yml | 14 ++++---------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index a0c12796f..955cef3ee 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -8,6 +8,7 @@ on: jobs: build_and_test_with_code_coverage: + if: ${{ false }} name: Build and test runs-on: ${{ matrix.os }} strategy: @@ -33,16 +34,15 @@ jobs: - name: Gradle build with remote cache uses: burrunan/gradle-cache-action@v1 with: + arguments: | + build + -x detekt properties: | org.gradle.caching=true gradle-version: wrapper # additional files to calculate key for dependency cache gradle-dependencies-cache-key: | buildSrc/**/Versions.kt - - name: Run gradle command - run: | - chmod +x gradlew - ./gradlew build -x detekt - name: Upload gradle reports if: ${{ always() }} uses: actions/upload-artifact@v2 diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml index f4d619f6a..023c9832e 100644 --- a/.github/workflows/detekt.yml +++ b/.github/workflows/detekt.yml @@ -17,13 +17,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.11 - - name: Gradle build with remote cache - uses: burrunan/gradle-cache-action@v1 - with: - arguments: detektAll - properties: | - org.gradle.caching=true - gradle-version: wrapper - # additional files to calculate key for dependency cache - gradle-dependencies-cache-key: | - buildSrc/**/Versions.kt + - name: Run gradle command + run: | + chmod +x gradlew + ./gradlew detektAll From 8c2ddde2608876cc7dc4cc7c2fb5cc53e1073a20 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Wed, 19 May 2021 18:41:01 +0300 Subject: [PATCH 08/13] Version updates ### What's done: * Koltin 1.5 * Others --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0499ab613..5577198fd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,11 +22,11 @@ allprojects { } configureDiktat() // FixMe: https://github.com/cqfn/save/issues/67 - //configureDetekt() + configureDetekt() } createDiktatTask() // FixMe: https://github.com/cqfn/save/issues/67 -//createDetektTask() +createDetektTask() installGitHooks() configurePublishing() From f5870663cc389b6b9b04e7b9f23fd6c399f53226 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Wed, 19 May 2021 18:46:39 +0300 Subject: [PATCH 09/13] Version updates ### What's done: * Koltin 1.5 * Others --- .../commonMain/kotlin/org/cqfn/save/core/utils/PlatformUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/save-common/src/commonMain/kotlin/org/cqfn/save/core/utils/PlatformUtils.kt b/save-common/src/commonMain/kotlin/org/cqfn/save/core/utils/PlatformUtils.kt index 00bb8a9e6..5c6e55093 100644 --- a/save-common/src/commonMain/kotlin/org/cqfn/save/core/utils/PlatformUtils.kt +++ b/save-common/src/commonMain/kotlin/org/cqfn/save/core/utils/PlatformUtils.kt @@ -2,7 +2,7 @@ * This file contains platform-dependent utils */ -@file:Suppress("FILE_NAME_MATCH_CLASS") +@file:Suppress("FILE_NAME_MATCH_CLASS", "MatchingDeclarationName") package org.cqfn.save.core.utils From 518b1b80d2a7f3f54b066ab2b36393614af173d6 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Thu, 20 May 2021 10:42:37 +0300 Subject: [PATCH 10/13] Version updates ### What's done: * Koltin 1.5 * Others --- .github/workflows/build_and_test.yml | 10 ++++------ .github/workflows/detekt.yml | 9 +++++++++ .github/workflows/diktat.yml | 6 ++++-- .github/workflows/release.yml | 8 +++++--- buildSrc/src/main/kotlin/Versions.kt | 1 - 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 2f48bf5fd..1ab62a042 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -8,7 +8,6 @@ on: jobs: build_and_test_with_code_coverage: - if: ${{ false }} name: Build and test runs-on: ${{ matrix.os }} strategy: @@ -31,19 +30,18 @@ jobs: key: ${{ runner.os }}-gradle-konan restore-keys: | ${{ runner.os }}-gradle-konan - - name: Gradle build with remote cache + - name: Start Gradle remote cache server uses: burrunan/gradle-cache-action@v1 with: - arguments: | - build - # FixMe: https://github.com/cqfn/save/issues/67 - # -x detekt properties: | org.gradle.caching=true gradle-version: wrapper # additional files to calculate key for dependency cache gradle-dependencies-cache-key: | buildSrc/**/Versions.kt + # Until https://github.com/burrunan/gradle-cache-action/issues/42 is addressed, gradle should be run as a separate step + - name: Run gradle command + run: ./gradlew build - name: Upload gradle reports if: ${{ always() }} uses: actions/upload-artifact@v2 diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml index 023c9832e..528fdb8e8 100644 --- a/.github/workflows/detekt.yml +++ b/.github/workflows/detekt.yml @@ -17,6 +17,15 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.11 + - name: Start Gradle remote cache server + uses: burrunan/gradle-cache-action@v1 + with: + properties: | + org.gradle.caching=true + gradle-version: wrapper + # additional files to calculate key for dependency cache + gradle-dependencies-cache-key: | + buildSrc/**/Versions.kt - name: Run gradle command run: | chmod +x gradlew diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml index 8b140a3bb..5e39ff596 100644 --- a/.github/workflows/diktat.yml +++ b/.github/workflows/diktat.yml @@ -17,13 +17,15 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.11 - - name: Gradle build with remote cache + - name: Start Gradle remote cache server uses: burrunan/gradle-cache-action@v1 with: - arguments: diktatCheckAll properties: | org.gradle.caching=true gradle-version: wrapper # additional files to calculate key for dependency cache gradle-dependencies-cache-key: | buildSrc/**/Versions.kt + # Until https://github.com/burrunan/gradle-cache-action/issues/42 is addressed, gradle should be run as a separate step + - name: Run gradle command + run: ./gradlew diktatCheckAll diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cea3a7a62..b52ad6d18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, windows-latest ] #, macos-latest ] + os: [ ubuntu-latest, windows-latest, macos-latest ] steps: - name: Checkout uses: actions/checkout@v2.3.3 @@ -27,10 +27,12 @@ jobs: - name: Status git beforeafter run: git status - uses: burrunan/gradle-cache-action@v1 - name: Gradle release with caches caching + name: Start Gradle remote cache server with: - arguments: linkReleaseExecutableMultiplatform publishToSonatype closeSonatypeStagingRepository gradle-version: wrapper + # Until https://github.com/burrunan/gradle-cache-action/issues/42 is addressed, gradle should be run as a separate step + - name: Run gradle command + run: ./gradlew linkReleaseExecutableMultiplatform publishToSonatype closeSonatypeStagingRepository - name: Upload artifact id: upload_artifact uses: actions/upload-artifact@v2 diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 43184034a..5fdb31d73 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -6,7 +6,6 @@ object Versions { const val okio = "3.0.0-alpha.1" const val ktoml = "0.2.4" - // kek waitttt object Kotlinx { const val serialization = "1.1.0" const val datetime = "0.1.1" From 8482e7f5bf78fdb8a43dc19819d538b7a8aa6252 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Thu, 20 May 2021 10:54:10 +0300 Subject: [PATCH 11/13] Version updates ### What's done: * Koltin 1.5 * Others --- build.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5577198fd..bb13312f9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,11 +21,9 @@ allprojects { maven(url = "https://kotlin.bintray.com/kotlinx/") } configureDiktat() - // FixMe: https://github.com/cqfn/save/issues/67 configureDetekt() } createDiktatTask() -// FixMe: https://github.com/cqfn/save/issues/67 createDetektTask() installGitHooks() From 409452c379d085ef467e85c3a46f0b5adc205936 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Thu, 20 May 2021 11:01:08 +0300 Subject: [PATCH 12/13] Version updates ### What's done: * Koltin 1.5 * Others --- .github/workflows/build_and_test.yml | 4 +--- .github/workflows/detekt.yml | 6 +----- .github/workflows/diktat.yml | 4 +--- .github/workflows/release.yml | 2 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 1ab62a042..a89e646a8 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -33,15 +33,13 @@ jobs: - name: Start Gradle remote cache server uses: burrunan/gradle-cache-action@v1 with: - properties: | - org.gradle.caching=true gradle-version: wrapper # additional files to calculate key for dependency cache gradle-dependencies-cache-key: | buildSrc/**/Versions.kt # Until https://github.com/burrunan/gradle-cache-action/issues/42 is addressed, gradle should be run as a separate step - name: Run gradle command - run: ./gradlew build + run: ./gradlew build --build-cache - name: Upload gradle reports if: ${{ always() }} uses: actions/upload-artifact@v2 diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml index 528fdb8e8..488b31242 100644 --- a/.github/workflows/detekt.yml +++ b/.github/workflows/detekt.yml @@ -20,13 +20,9 @@ jobs: - name: Start Gradle remote cache server uses: burrunan/gradle-cache-action@v1 with: - properties: | - org.gradle.caching=true gradle-version: wrapper # additional files to calculate key for dependency cache gradle-dependencies-cache-key: | buildSrc/**/Versions.kt - name: Run gradle command - run: | - chmod +x gradlew - ./gradlew detektAll + run: ./gradlew detektAll --build-cache diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml index 5e39ff596..2520be0dd 100644 --- a/.github/workflows/diktat.yml +++ b/.github/workflows/diktat.yml @@ -20,12 +20,10 @@ jobs: - name: Start Gradle remote cache server uses: burrunan/gradle-cache-action@v1 with: - properties: | - org.gradle.caching=true gradle-version: wrapper # additional files to calculate key for dependency cache gradle-dependencies-cache-key: | buildSrc/**/Versions.kt # Until https://github.com/burrunan/gradle-cache-action/issues/42 is addressed, gradle should be run as a separate step - name: Run gradle command - run: ./gradlew diktatCheckAll + run: ./gradlew diktatCheckAll --build-cache diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b52ad6d18..6f26a1523 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: gradle-version: wrapper # Until https://github.com/burrunan/gradle-cache-action/issues/42 is addressed, gradle should be run as a separate step - name: Run gradle command - run: ./gradlew linkReleaseExecutableMultiplatform publishToSonatype closeSonatypeStagingRepository + run: ./gradlew --build-cache linkReleaseExecutableMultiplatform publishToSonatype closeSonatypeStagingRepository - name: Upload artifact id: upload_artifact uses: actions/upload-artifact@v2 diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 5fdb31d73..9f92a35a3 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -8,7 +8,7 @@ object Versions { object Kotlinx { const val serialization = "1.1.0" - const val datetime = "0.1.1" + const val datetime = "0.2.0" const val cli = "0.3.2" } } From 61f7ea060c832a4528b8843dd9b47ea612aa1a9a Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Thu, 20 May 2021 11:33:42 +0300 Subject: [PATCH 13/13] Version updates ### What's done: * Koltin 1.5 * Others --- .github/workflows/build_and_test.yml | 3 +-- .github/workflows/detekt.yml | 3 +-- .github/workflows/diktat.yml | 3 +-- .github/workflows/release.yml | 1 - .../kotlin/org/cqfn/save/plugins/fix/FixPluginTest.kt | 4 ++-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index a89e646a8..0ced4b375 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -30,8 +30,7 @@ jobs: key: ${{ runner.os }}-gradle-konan restore-keys: | ${{ runner.os }}-gradle-konan - - name: Start Gradle remote cache server - uses: burrunan/gradle-cache-action@v1 + - uses: burrunan/gradle-cache-action@v1 with: gradle-version: wrapper # additional files to calculate key for dependency cache diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml index 488b31242..45ba2e3c3 100644 --- a/.github/workflows/detekt.yml +++ b/.github/workflows/detekt.yml @@ -17,8 +17,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.11 - - name: Start Gradle remote cache server - uses: burrunan/gradle-cache-action@v1 + - uses: burrunan/gradle-cache-action@v1 with: gradle-version: wrapper # additional files to calculate key for dependency cache diff --git a/.github/workflows/diktat.yml b/.github/workflows/diktat.yml index 2520be0dd..7cf0cd8ae 100644 --- a/.github/workflows/diktat.yml +++ b/.github/workflows/diktat.yml @@ -17,8 +17,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.11 - - name: Start Gradle remote cache server - uses: burrunan/gradle-cache-action@v1 + - uses: burrunan/gradle-cache-action@v1 with: gradle-version: wrapper # additional files to calculate key for dependency cache diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6f26a1523..b537035e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,6 @@ jobs: - name: Status git beforeafter run: git status - uses: burrunan/gradle-cache-action@v1 - name: Start Gradle remote cache server with: gradle-version: wrapper # Until https://github.com/burrunan/gradle-cache-action/issues/42 is addressed, gradle should be run as a separate step diff --git a/save-plugins/fix-plugin/src/commonTest/kotlin/org/cqfn/save/plugins/fix/FixPluginTest.kt b/save-plugins/fix-plugin/src/commonTest/kotlin/org/cqfn/save/plugins/fix/FixPluginTest.kt index 6610d725c..b3254afa7 100644 --- a/save-plugins/fix-plugin/src/commonTest/kotlin/org/cqfn/save/plugins/fix/FixPluginTest.kt +++ b/save-plugins/fix-plugin/src/commonTest/kotlin/org/cqfn/save/plugins/fix/FixPluginTest.kt @@ -74,7 +74,7 @@ class FixPluginTest { write("Expected file".encodeToByteArray()) } - val diskWithTmpDir = if (isCurrentOsWindows()) "${tmpDir.toString().substringBefore("\\").toLowerCase()} && " else "" + val diskWithTmpDir = if (isCurrentOsWindows()) "${tmpDir.toString().substringBefore("\\").lowercase()} && " else "" val executionCmd = "${diskWithTmpDir}cd $tmpDir && echo Expected file > Test3Test.java" val results = FixPlugin().execute( @@ -104,7 +104,7 @@ class FixPluginTest { fs.write(expectedFile) { write("Expected file".encodeToByteArray()) } - val diskWithTmpDir = if (isCurrentOsWindows()) "${tmpDir.toString().substringBefore("\\").toLowerCase()} && " else "" + val diskWithTmpDir = if (isCurrentOsWindows()) "${tmpDir.toString().substringBefore("\\").lowercase()} && " else "" val executionCmd = "${diskWithTmpDir}cd $tmpDir && echo Expected file > Test3Test_copy.java" val results = FixPlugin().execute(