Skip to content

Commit

Permalink
Switch to IJP 242 EAP
Browse files Browse the repository at this point in the history
This in turn requires:
1. Updating the IJP Gradle plugin to 2.0 (beta)
2. Reworking the IDE sample build.gradle.kts in the new 2.0 syntax
3. Bumping the JBR version to 21
  • Loading branch information
rock3r committed Jul 2, 2024
1 parent e0cffd2 commit 9d79a24
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
1 change: 1 addition & 0 deletions buildSrc/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ rootProject.name = "buildSrc"
dependencyResolutionManagement {
repositories {
google()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
gradlePluginPortal()
mavenCentral()
}
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/jewel.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ version = when {
java {
toolchain {
vendor = JvmVendorSpec.JETBRAINS
languageVersion = JavaLanguageVersion.of(17)
languageVersion = JavaLanguageVersion.of(21)
}
}

kotlin {
jvmToolchain {
vendor = JvmVendorSpec.JETBRAINS
languageVersion = JavaLanguageVersion.of(17)
languageVersion = JavaLanguageVersion.of(21)
}

target {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.sun.jna.NativeLong
* Could be an address in memory (if pointer to a class or method) or a
* value (like 0 or 1)
*/
@Suppress("OVERRIDE_DEPRECATION") // Copied code
internal class ID : NativeLong {
constructor()
constructor(peer: Long) : super(peer)
Expand Down
4 changes: 3 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@ kotlin.stdlib.default.dependency=false
# See https://jb.gg/intellij-platform-kotlin-oom
kotlin.incremental.useClasspathSnapshot=false

ijp.target=241
org.jetbrains.intellij.platform.buildFeature.useBinaryReleases=false

ijp.target=242
jewel.release.version=0.19.7
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ commonmark = "0.22.0"
composeDesktop = "1.7.0-dev1703"
detekt = "1.23.6"
dokka = "1.9.20"
idea = "241.17890.1"
ideaGradlePlugin = "1.17.3"
idea = "242.19533.56-EAP-SNAPSHOT"
ideaGradlePlugin = "2.0.0-beta8"
jna = "5.14.0"
kotlin = "1.9.24"
kotlinSarif = "0.5.0"
Expand Down Expand Up @@ -46,7 +46,7 @@ idea = ["ij-platform-ide-core", "ij-platform-ide-impl", "ij-platform-core-ui"]
composeDesktop = { id = "org.jetbrains.compose", version.ref = "composeDesktop" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
ideaGradlePlugin = { id = "org.jetbrains.intellij", version.ref = "ideaGradlePlugin" }
ideaGradlePlugin = { id = "org.jetbrains.intellij.platform", version.ref = "ideaGradlePlugin" }
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlinx-binaryCompatValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinxBinaryCompat" }
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
Expand Down
26 changes: 12 additions & 14 deletions samples/ide-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,18 @@ plugins {
`android-studio-releases-generator`
}

intellij {
pluginName = "Jewel Demo"
plugins = listOf("org.jetbrains.kotlin")
version = libs.versions.idea.get()
}

// TODO remove this once the IJ Gradle plugin fixes their repositories bug
// See https://github.com/JetBrains/gradle-intellij-plugin/issues/776
repositories {
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://www.jetbrains.com/intellij-repository/releases")
maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
google()
mavenCentral()

intellijPlatform {
defaultRepositories()
}
}

dependencies {
intellijPlatform {
intellijIdeaCommunity(libs.versions.idea)
bundledPlugins("org.jetbrains.kotlin")
}

implementation(projects.ideLafBridge) {
exclude(group = "org.jetbrains.kotlinx")
}
Expand All @@ -37,6 +31,10 @@ dependencies {
}
}

intellijPlatform {
pluginConfiguration { name = "Jewel Demo" }
}

tasks {
// We don't have any settings in the demo plugin
buildSearchableOptions {
Expand Down
6 changes: 2 additions & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ rootProject.name = "jewel"

pluginManagement {
repositories {
gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/")
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://oss.sonatype.org/content/repositories/snapshots/")
gradlePluginPortal()
mavenCentral()
}
}
Expand All @@ -17,9 +18,6 @@ dependencyResolutionManagement {
repositories {
google()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
maven("https://www.jetbrains.com/intellij-repository/releases")
maven("https://www.jetbrains.com/intellij-repository/snapshots")
maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
mavenCentral()
}
}
Expand Down

0 comments on commit 9d79a24

Please sign in to comment.