From 617cb8e922ab98a889b2357790dc918c4b1bdfe4 Mon Sep 17 00:00:00 2001 From: Amin Ghadersohi Date: Fri, 20 Jan 2023 16:02:29 -0500 Subject: [PATCH 1/3] koltin 1.8 --- build.gradle.kts | 4 ++-- buildSrc/src/main/kotlin/Libs.kt | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 64f007d..61c27f9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,11 +18,11 @@ allprojects { mavenCentral() } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } tasks.withType { // Target version of the generated JVM bytecode. It is used for type resolution. - this.jvmTarget = "1.8" + this.jvmTarget = "11" } } diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 7dbd382..80c09a3 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -10,7 +10,7 @@ object Libs { const val googleJavaFormatCli = "1.7" const val gradlePluginPublish = "0.17.0" const val junit = "4.13.2" - const val kotlin = "1.5.31" + const val kotlin = "1.8.0" const val ktlint = "0.43.0" const val ktlintGradlePlugin = "10.2.0" const val snakeyaml = "1.29" diff --git a/gradle.properties b/gradle.properties index 4a23673..fc4252f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.daemon=true org.gradle.parallel=true GROUP=com.tinder.gitquery -VERSION_NAME=3.0.12 +VERSION_NAME=3.1.0 POM_DESCRIPTION=A library for querying and syncing files in a remote git repo. POM_URL=https://github.com/Tinder/GitQuery diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 549d844..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 3b00e578721d58580acad41891789ce4791c50f4 Mon Sep 17 00:00:00 2001 From: Amin Ghadersohi Date: Fri, 20 Jan 2023 16:07:49 -0500 Subject: [PATCH 2/3] update --- .github/workflows/bazel.yml | 2 +- .github/workflows/gradle.yml | 2 +- .github/workflows/samples_gradle.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml index cfc11a3..d08f7ba 100644 --- a/.github/workflows/bazel.yml +++ b/.github/workflows/bazel.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Java JDK uses: actions/setup-java@v1.4.3 with: - java-version: 1.8 + java-version: 11 id: java - uses: actions/checkout@v2 - name: Build Deploy Jar diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9c67402..06e39f4 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 8 + java-version: 11 - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/samples_gradle.yml b/.github/workflows/samples_gradle.yml index 2be73d3..93c51a1 100644 --- a/.github/workflows/samples_gradle.yml +++ b/.github/workflows/samples_gradle.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 8 + java-version: 11 - uses: webfactory/ssh-agent@v0.5.4 with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} From d4a4a218cbf067561ababa7e558451280965e6f8 Mon Sep 17 00:00:00 2001 From: Amin Ghadersohi Date: Fri, 20 Jan 2023 16:08:59 -0500 Subject: [PATCH 3/3] update --- .../src/main/kotlin/com/tinder/gitquery/core/GitQueryVersion.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/kotlin/com/tinder/gitquery/core/GitQueryVersion.kt b/core/src/main/kotlin/com/tinder/gitquery/core/GitQueryVersion.kt index 0f4d6d7..393d1a5 100644 --- a/core/src/main/kotlin/com/tinder/gitquery/core/GitQueryVersion.kt +++ b/core/src/main/kotlin/com/tinder/gitquery/core/GitQueryVersion.kt @@ -4,4 +4,4 @@ package com.tinder.gitquery.core * This file was generated by ./build-support/bin/write-version-class */ -const val GIT_QUERY_VERSION = "3.0.12" +const val GIT_QUERY_VERSION = "3.1.0"