diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 923a486..8263c16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '17' + java-version: '19' - name: Build and test uses: gradle/gradle-build-action@v2 diff --git a/build.gradle.kts b/build.gradle.kts index 3582de2..e70a9d0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,10 +15,11 @@ */ import io.gitlab.arturbosch.detekt.Detekt import org.jetbrains.dokka.gradle.DokkaTask +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version libs.versions.kotlin.get() + alias(libs.plugins.kotlin.jvm) alias(libs.plugins.dokka) alias(libs.plugins.detekt) alias(libs.plugins.lint) @@ -53,19 +54,21 @@ spotless { } } -configure { toolchain { languageVersion.set(JavaLanguageVersion.of(17)) } } +configure { toolchain { languageVersion.set(JavaLanguageVersion.of(19)) } } -tasks.withType().configureEach { options.release.set(8) } +tasks.withType().configureEach { + options.release.set(libs.versions.jvmTarget.get().toInt()) +} tasks.withType().configureEach { - kotlinOptions { - jvmTarget = "1.8" - allWarningsAsErrors = true - freeCompilerArgs = freeCompilerArgs + listOf("-progressive", "-opt-in=kotlin.RequiresOptIn") + compilerOptions { + jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get())) + allWarningsAsErrors.set(true) + freeCompilerArgs.add("-progressive") } } -tasks.withType().configureEach { jvmTarget = "1.8" } +tasks.withType().configureEach { jvmTarget = libs.versions.jvmTarget.get() } tasks.withType().configureEach { outputDirectory.set(rootDir.resolve("../docs/0.x")) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8c624d5..61be4f5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,14 @@ [versions] -kotlin = "1.6.10" -ktfmt = "0.34" -jvmTarget = "1.8" +kotlin = "1.8.22" +ktfmt = "0.43" +jvmTarget = "17" [plugins] -detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.19.0" } -dokka = { id = "org.jetbrains.dokka", version = "1.6.10" } -lint = { id = "com.android.lint", version = "7.1.2" } +detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.0" } +dokka = { id = "org.jetbrains.dokka", version = "1.8.20" } +lint = { id = "com.android.lint", version = "8.0.2" } mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.19.0" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } spotless = { id = "com.diffplug.spotless", version = "6.19.0" } binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..c1962a7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +210,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/kotlin/slack/cli/AppleSiliconCompat.kt b/src/main/kotlin/slack/cli/AppleSiliconCompat.kt index c15be95..ceb113f 100644 --- a/src/main/kotlin/slack/cli/AppleSiliconCompat.kt +++ b/src/main/kotlin/slack/cli/AppleSiliconCompat.kt @@ -16,7 +16,6 @@ package slack.cli import eu.jrie.jetbrains.kotlinshell.shell.shell -import kotlinx.coroutines.ExperimentalCoroutinesApi import okio.Buffer import slack.cli.AppleSiliconCompat.Arch.ARM64 import slack.cli.AppleSiliconCompat.Arch.X86_64 @@ -35,7 +34,6 @@ public object AppleSiliconCompat { * https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment#Determine-Whether-Your-App-Is-Running-as-a-Translated-Binary */ @Suppress("ReturnCount") - @OptIn(ExperimentalCoroutinesApi::class) public fun validate(errorMessage: () -> String) { if (System.getenv("SLACK_SKIP_APPLE_SILICON_CHECK")?.toBoolean() == true) { // Toe-hold to skip this check if anything goes wrong. diff --git a/src/test/kotlin/slack/cli/TomlTest.kt b/src/test/kotlin/slack/cli/TomlTest.kt index 7e71599..ed02451 100644 --- a/src/test/kotlin/slack/cli/TomlTest.kt +++ b/src/test/kotlin/slack/cli/TomlTest.kt @@ -28,7 +28,8 @@ class TomlTest { kotlin = "1.6.10" # Trailing comment is skipped # Skipped jvmTarget = "1.8" - """.trimIndent() + """ + .trimIndent() val versions = Toml.parseVersion(toml.lineSequence()) assertThat(versions).containsExactly("kotlin", "1.6.10", "jvmTarget", "1.8") } @@ -45,7 +46,8 @@ class TomlTest { [libraries] # Skipped jvmTarget = "17" - """.trimIndent() + """ + .trimIndent() val versions = Toml.parseVersion(toml.lineSequence()) assertThat(versions).containsExactly("kotlin", "1.6.10", "jvmTarget", "1.8") }