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 Kotlin to 1.9.24 (matching the bundled version)
2. Updating the IJP Gradle plugin to 2.0 (beta)
3. Updating Gradle (not mandatory, but why not)
4. Updating Compose to 1.6.20-dev1646
5. Reworking the IDE sample build.gradle.kts in the new 2.0 syntax
6. Bumping the JBR version to 21
  • Loading branch information
rock3r committed May 27, 2024
1 parent 3bf84db commit d685c77
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 25 deletions.
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
@@ -1,8 +1,8 @@
package org.jetbrains.jewel.buildlogic.demodata

import com.squareup.kotlinpoet.ClassName
import gradle.kotlin.dsl.accessors._191c70c30b85215d3734a2125d755542.main
import gradle.kotlin.dsl.accessors._191c70c30b85215d3734a2125d755542.sourceSets
import gradle.kotlin.dsl.accessors._2568f72cb9e4ce984c7f1bb76d889841.main
import gradle.kotlin.dsl.accessors._2568f72cb9e4ce984c7f1bb76d889841.sourceSets
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.decodeFromStream
import org.gradle.api.DefaultTask
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ kotlin.stdlib.default.dependency=false
# See https://jb.gg/intellij-platform-kotlin-oom
kotlin.incremental.useClasspathSnapshot=false

ijp.target=241
ijp.target=242
jewel.release.version=0.19.3
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[versions]
commonmark = "0.22.0"
composeDesktop = "1.6.10-dev1584"
composeDesktop = "1.6.20-dev1646"
detekt = "1.23.4"
dokka = "1.8.20"
idea = "241.17011.79"
ideaGradlePlugin = "1.17.1"
idea = "242.10180.25-EAP-SNAPSHOT"
ideaGradlePlugin = "2.0.0-beta2"
jna = "5.14.0"
kotlin = "1.8.21"
kotlin = "1.9.24"
kotlinSarif = "0.5.0"
kotlinpoet = "1.15.2"
kotlinterGradlePlugin = "3.16.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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
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

0 comments on commit d685c77

Please sign in to comment.