diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0546a888..96eb4380 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '21' + java-version: '22' - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bbbe2cf..b8235a58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,19 @@ Changelog ========= +0.8.0 +----- + +_2024-10-02_ + +- **Enhancement**: Tweak explanation for default dispatcher use in rx<->flow interop. +- **Enhancement**: Switch to stable kotlin-metadata artifact +- **Fix**: Allow Dagger providers to be called from test sources. +- Build against lint `8.8.0-alpha04`. +- Update `api`/`minApi` to `16` (Lint 8.7.0+). +- Build against Kotlin `2.0.20`. +- Target Kotlin language version `1.9` in lint-checks (imposed by lint), `2.0` in lint-annotations. + 0.7.3 ----- diff --git a/build.gradle.kts b/build.gradle.kts index ef1229e6..c7ada7df 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,6 +6,7 @@ import com.vanniktech.maven.publish.MavenPublishBaseExtension import io.gitlab.arturbosch.detekt.Detekt import org.jetbrains.dokka.gradle.DokkaTaskPartial import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { @@ -91,8 +92,10 @@ subprojects { jvmTarget.set(JvmTarget.fromTarget(jvmTargetString)) // TODO re-enable on checks if lint ever targets latest kotlin versions if (isChecksProject) { + // Lint forces Kotlin 1.9 still + languageVersion.set(KotlinVersion.KOTLIN_1_9) + } else { allWarningsAsErrors.set(true) - // progressiveMode.set(true) } } } diff --git a/gradle.properties b/gradle.properties index f79271bd..d34f91b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ POM_DEVELOPER_ID=slackhq POM_DEVELOPER_NAME=Slack Technologies, LLC. POM_DEVELOPER_URL=https://github.com/slackhq POM_INCEPTION_YEAR=2021 -VERSION_NAME=1.0.0-SNAPSHOT +VERSION_NAME=0.8.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f9bcbf46..f1309966 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.0.20" ktfmt = "0.52" -jdk = "21" +jdk = "22" # lint checks must target JDK 17, but the runtime should remain 11 lintJvmTarget = "17" runtimeJvmTarget = "11" diff --git a/slack-lint-checks/gradle.properties b/slack-lint-checks/gradle.properties index bca8a2bf..e0e09d46 100644 --- a/slack-lint-checks/gradle.properties +++ b/slack-lint-checks/gradle.properties @@ -2,6 +2,6 @@ POM_ARTIFACT_ID=slack-lint-checks POM_NAME=Slack Lint Checks POM_DESCRIPTION=Slack lint checks. -# Kotlin adds the stdlib dep by default in 1.4.0+, but that's not really allowed in lint jars. This -# disables that behavior for now +# Opt-out flag for bundling Kotlin standard library because Lint forces its own version +# See https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library kotlin.stdlib.default.dependency=false