Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to stable kotlin metadata + update shadow plugin #299

Merged
merged 5 commits into from
Sep 3, 2024
Merged

Switch to stable kotlin metadata + update shadow plugin #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
936b1a0
Switch to stable kotlin metadata
ZacSweers Aug 25, 2024
f3289c7
Update to new shadow plugin coordinates
ZacSweers Aug 25, 2024
f6b6151
Patch another stdlib check
ZacSweers Aug 25, 2024
67b65da
Spotless
ZacSweers Aug 25, 2024
64e1702
Merge branch 'main' into z/stableMetadata
ZacSweers Aug 26, 2024
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
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ lint = { id = "com.android.lint", version = "8.7.0-alpha07" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version = "2.0.20-1.0.24" }
mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.29.0" }
mavenShadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
shadow = { id = "com.gradleup.shadow", version = "8.3.0" }
spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA2" }

[libraries]
autoService-annotations = "com.google.auto.service:auto-service-annotations:1.1.1"
autoService-ksp = "dev.zacsweers.autoservice:auto-service-ksp:1.2.0"
junit = "junit:junit:4.13.2"
kotlin-metadata = { module = "org.jetbrains.kotlinx:kotlinx-metadata-jvm", version = "0.9.0" }
kotlin-metadata = { module = "org.jetbrains.kotlin:kotlin-metadata-jvm", version.ref = "kotlin" }
ktfmt = { module = "com.facebook:ktfmt", version.ref = "ktfmt" }
eithernet = "com.slack.eithernet:eithernet:1.9.0"
retrofit = "com.squareup.retrofit2:retrofit:2.11.0"
Expand Down
8 changes: 5 additions & 3 deletions slack-lint-checks/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ plugins {
alias(libs.plugins.lint)
alias(libs.plugins.ksp)
alias(libs.plugins.mavenPublish)
alias(libs.plugins.mavenShadow)
alias(libs.plugins.shadow)
alias(libs.plugins.buildConfig)
}

val lintKotlinVersion = KotlinVersion(1, 9, 21)
val lintKotlinVersion = KotlinVersion(1, 9, 20)

buildConfig {
packageName("slack.lint")
Expand Down Expand Up @@ -57,7 +57,9 @@ dependencies {
shade(libs.kotlin.metadata) { exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib") }

// Dupe the dep because the shaded version is compileOnly in the eyes of the gradle configurations
testImplementation(libs.kotlin.metadata)
testImplementation(libs.kotlin.metadata) {
exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib")
}
testImplementation(libs.bundles.lintTest)
testImplementation(libs.junit)

Expand Down
20 changes: 10 additions & 10 deletions slack-lint-checks/src/main/java/slack/lint/util/MetadataJavaEvaluator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ import com.intellij.psi.PsiType
import java.util.Optional
import java.util.concurrent.ConcurrentHashMap
import kotlin.jvm.optionals.getOrNull
import kotlinx.metadata.ClassKind
import kotlinx.metadata.KmClass
import kotlinx.metadata.Modality
import kotlinx.metadata.isData
import kotlinx.metadata.isValue
import kotlinx.metadata.jvm.JvmMetadataVersion
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlinx.metadata.jvm.Metadata as MetadataWithNullableArgs
import kotlinx.metadata.kind
import kotlinx.metadata.modality
import kotlin.metadata.ClassKind
import kotlin.metadata.KmClass
import kotlin.metadata.Modality
import kotlin.metadata.isData
import kotlin.metadata.isValue
import kotlin.metadata.jvm.JvmMetadataVersion
import kotlin.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.Metadata as MetadataWithNullableArgs
import kotlin.metadata.kind
import kotlin.metadata.modality
import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtObjectDeclaration
Expand Down
2 changes: 1 addition & 1 deletion slack-lint-checks/src/main/java/slack/lint/util/Names.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package slack.lint.util

import kotlinx.metadata.ClassName
import kotlin.metadata.ClassName

/**
* Represents a qualified package
Expand Down