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

Supporting K2 with Skate + update to IJ 2024.2.1 #1006

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Supporting K2 with Skate + update to IJ 2024.2.1 #1006

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
34b44a0
Declare K2 compatibility
kateliu20 Oct 2, 2024
158a05a
Update target version to 242
kateliu20 Oct 2, 2024
0f7c0a1
Update remaining dependencies
ZacSweers Oct 2, 2024
f6aac7d
Test IDE in CI too
ZacSweers Oct 3, 2024
5c69d42
Add boms
ZacSweers Oct 3, 2024
874a4b0
Update deprecated API
ZacSweers Oct 3, 2024
cf6978c
Enforce junit4
ZacSweers Oct 3, 2024
d370dc3
Update link
ZacSweers Oct 3, 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
15 changes: 3 additions & 12 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,19 +208,10 @@ subprojects {
this.jvmTarget.set(jvmTargetVersion)
freeCompilerArgs.addAll(
// Enhance not null annotated type parameter's types to definitely not null types
// (@NotNull T
// => T & Any)
// (@NotNull T => T & Any)
"-Xenhance-type-parameter-types-to-def-not-null",
// Use fast implementation on Jar FS. This may speed up compilation time, but currently
// it's
// an experimental mode
// TODO toe-hold but we can't use it yet because it emits a warning that fails with
// -Werror
// https://youtrack.jetbrains.com/issue/KT-54928
// "-Xuse-fast-jar-file-system",
// Support inferring type arguments based on only self upper bounds of the corresponding
// type
// parameters
// type parameters
"-Xself-upper-bound-inference",
"-Xjsr305=strict",
// Match JVM assertion behavior:
Expand Down Expand Up @@ -336,7 +327,7 @@ subprojects {
}
}
project.dependencies {
configure<IntelliJPlatformDependenciesExtension> { intellijIdeaCommunity("2024.1.2") }
configure<IntelliJPlatformDependenciesExtension> { intellijIdeaCommunity("2024.2.1") }
}

if (hasProperty("SgpIntellijArtifactoryBaseUrl")) {
Expand Down
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 @@ -113,8 +113,8 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref =
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
kotlinShell = "eu.jrie.jetbrains:kotlin-shell-core:0.2.1"
ktfmt = { module = "com.facebook:ktfmt", version.ref = "ktfmt" }
jewel-bridge = { module = "org.jetbrains.jewel:jewel-ide-laf-bridge-241", version.ref = "jewel" }
jewel-standalone = { module = "org.jetbrains.jewel:jewel-int-ui-standalone-241", version.ref = "jewel" }
jewel-bridge = { module = "org.jetbrains.jewel:jewel-ide-laf-bridge-242", version.ref = "jewel" }
jewel-standalone = { module = "org.jetbrains.jewel:jewel-int-ui-standalone-242", version.ref = "jewel" }
jgrapht = "org.jgrapht:jgrapht-core:1.5.2"
jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
jna-platform = { module = "net.java.dev.jna:jna-platform", version.ref = "jna" }
Expand Down
2 changes: 1 addition & 1 deletion platforms/intellij/artifactory-authenticator/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PLUGIN_ID=com.slack.intellij.artifactory
PLUGIN_NAME=Artifactory Authenticator
PLUGIN_DESCRIPTION=A plugin for authenticating plugin repositories with Artifactory.
VERSION_NAME=0.1.1
PLUGIN_SINCE_BUILD=241
PLUGIN_SINCE_BUILD=242
ARTIFACTORY_URL_SUFFIX=artifactory-authenticator
# Opt-out flag for bundling Kotlin standard library.
# See https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
Expand Down
2 changes: 1 addition & 1 deletion platforms/intellij/skate/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ dependencies {
// https://plugins.jetbrains.com/docs/intellij/android-studio.html#open-source-plugins-for-android-studio
// https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
// https://plugins.jetbrains.com/plugin/22989-android/versions/stable
plugin("org.jetbrains.android:241.17011.79")
plugin("org.jetbrains.android:242.21829.142")
bundledPlugins(
"com.intellij.java",
"org.intellij.plugins.markdown",
Expand Down
2 changes: 1 addition & 1 deletion platforms/intellij/skate/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PLUGIN_ID=com.slack.intellij.skate
PLUGIN_NAME=Skate
PLUGIN_DESCRIPTION=A plugin for IntelliJ and Android Studio for faster Kotlin and Android development!
VERSION_NAME=0.1.0
PLUGIN_SINCE_BUILD=241
PLUGIN_SINCE_BUILD=242
ARTIFACTORY_URL_SUFFIX=skate
# Opt-out flag for bundling Kotlin standard library.
# See https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
Expand Down
4 changes: 4 additions & 0 deletions platforms/intellij/skate/src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
canCloseContents="true" secondary="false" icon="AllIcons.Actions.Lightning"/>
</extensions>

<extensions defaultExtensionNs="org.jetbrains.kotlin">
<supportsKotlinPluginMode supportsK2="true" />
</extensions>

<projectListeners>
<listener
class="foundry.intellij.skate.WhatsNewToolWindowListener"
Expand Down
Loading