Skip to content

Commit 5a64450

Browse files
committed
1、Upgrade "IntelliJ Platform Gradle Plugin" to 2.7.0 2、Build 252
1 parent 58cfd5b commit 5a64450

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

build.gradle.kts

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
import de.undercouch.gradle.tasks.download.*
17+
import de.undercouch.gradle.tasks.download.Download
1818
import org.apache.tools.ant.taskdefs.condition.Os
19+
import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
1920
import java.io.ByteArrayOutputStream
2021

2122
plugins {
22-
id("org.jetbrains.intellij").version("1.13.3")
23+
id("org.jetbrains.intellij.platform") version "2.7.0"
2324
id("org.jetbrains.kotlin.jvm").version("2.1.0")
2425
id("de.undercouch.download").version("5.3.0")
2526
}
@@ -41,10 +42,10 @@ data class BuildData(
4142

4243
val buildDataList = listOf(
4344
BuildData(
44-
ideaSDKShortVersion = "251",
45-
ideaSDKVersion = "251.23774.435",
46-
sinceBuild = "251",
47-
untilBuild = "251.*",
45+
ideaSDKShortVersion = "2025.2",
46+
ideaSDKVersion = "252.23892.409",
47+
sinceBuild = "252",
48+
untilBuild = "252.*",
4849
bunch = "212",
4950
targetCompatibilityLevel = JavaVersion.VERSION_17,
5051
jvmTarget = "17"
@@ -147,8 +148,10 @@ task("installEmmyDebugger", type = Copy::class) {
147148

148149
project(":") {
149150
repositories {
150-
maven(url = "https://www.jetbrains.com/intellij-repository/releases")
151151
mavenCentral()
152+
intellijPlatform {
153+
defaultRepositories()
154+
}
152155
}
153156

154157
dependencies {
@@ -158,6 +161,10 @@ project(":") {
158161
implementation("org.luaj:luaj-jse:3.0.1")
159162
implementation("org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5")
160163
implementation("com.jgoodies:forms:1.2.1")
164+
intellijPlatform {
165+
intellijIdeaCommunity(buildVersionData.ideaSDKShortVersion)
166+
bundledModule("intellij.spellchecker")
167+
}
161168
}
162169

163170
sourceSets {
@@ -173,13 +180,9 @@ project(":") {
173180
targetCompatibility = buildVersionData.targetCompatibilityLevel
174181
}*/
175182

176-
intellij {
177-
type.set("IC")
178-
updateSinceUntilBuild.set(false)
179-
downloadSources.set(!isCI)
180-
version.set(buildVersionData.ideaSDKVersion)
181-
//localPath.set(System.getenv("IDEA_HOME_${buildVersionData.ideaSDKShortVersion}"))
182-
sandboxDir.set("${project.buildDir}/${buildVersionData.ideaSDKShortVersion}/idea-sandbox")
183+
intellijPlatform {
184+
version = buildVersionData.ideaSDKVersion
185+
sandboxContainer.set(layout.buildDirectory.dir("${buildVersionData.ideaSDKShortVersion}/idea-sandbox"))
183186
}
184187

185188
task("bunch") {
@@ -228,15 +231,15 @@ project(":") {
228231
untilBuild.set(buildVersionData.untilBuild)
229232
}
230233

231-
instrumentCode {
232-
compilerVersion.set(buildVersionData.instrumentCodeCompilerVersion)
233-
}
234+
// instrumentCode {
235+
// compilerVersion.set(buildVersionData.instrumentCodeCompilerVersion)
236+
// }
234237

235238
publishPlugin {
236239
token.set(System.getenv("IDEA_PUBLISH_TOKEN"))
237240
}
238241

239-
withType<org.jetbrains.intellij.tasks.PrepareSandboxTask> {
242+
withType<PrepareSandboxTask> {
240243
doLast {
241244
copy {
242245
from("src/main/resources/std")

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616

1717
distributionBase=GRADLE_USER_HOME
1818
distributionPath=wrapper/dists
19-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
19+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)