Skip to content

Commit ec18d16

Browse files
committed
upgrade gradle and plugins stdlib
gradle -> 8.5 intellij plugin -> 1.16.1 kotlin jvm plugin -> 1.9.21 kotlin stdlib -> 1.9.21
1 parent 4cf6d8b commit ec18d16

File tree

4 files changed

+200
-119
lines changed

4 files changed

+200
-119
lines changed

build.gradle.kts

+28-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ fun properties(key: String) = project.findProperty(key).toString()
33
plugins {
44
id("java")
55
//gradle-intellij-plugin
6-
id("org.jetbrains.intellij") version "1.1.4"
6+
id("org.jetbrains.intellij") version "1.16.1"
77
//kotlin
8-
id("org.jetbrains.kotlin.jvm") version "1.5.10"
8+
id("org.jetbrains.kotlin.jvm") version "1.9.21"
9+
10+
id("org.jetbrains.changelog") version "2.2.0"
911
}
1012

1113
allprojects {
@@ -16,7 +18,10 @@ allprojects {
1618
}
1719

1820
repositories {
21+
mavenLocal()
1922
mavenCentral()
23+
gradlePluginPortal()
24+
maven("https://maven.aliyun.com/repository/public/")
2025
maven("https://oss.sonatype.org/content/repositories/snapshots/")
2126
maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
2227
}
@@ -40,6 +45,14 @@ allprojects {
4045
}
4146

4247
tasks {
48+
withType<JavaCompile> {
49+
sourceCompatibility = "17"
50+
targetCompatibility = "17"
51+
}
52+
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
53+
kotlinOptions.jvmTarget = "17"
54+
}
55+
4356
test {
4457
useJUnitPlatform()
4558
}
@@ -54,15 +67,27 @@ allprojects {
5467
runPluginVerifier {
5568
ideVersions.set(properties("pluginVerifierIdeVersions").split(',').map(String::trim).filter(String::isNotEmpty))
5669
}
70+
5771
}
5872

5973
dependencies {
60-
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.5.21")
74+
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.21")
6175
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
6276
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.2")
6377
}
78+
79+
// Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
80+
kotlin {
81+
@Suppress("UnstableApiUsage")
82+
jvmToolchain {
83+
languageVersion = JavaLanguageVersion.of(17)
84+
vendor = JvmVendorSpec.JETBRAINS
85+
}
86+
}
6487
}
6588

89+
90+
6691
val Project.dependencyCachePath
6792
get(): String {
6893
val cachePath = file("${rootProject.projectDir}/deps")

gradle.properties

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
pluginGroup=io.xmake
22
pluginName=IntelliJ Xmake Plugin
3-
pluginVersion=1.2.3
4-
pluginSinceBuild=201
5-
pluginUntilBuild=291.*
3+
pluginVersion=1.3.0
4+
pluginSinceBuild=222.5
5+
pluginUntilBuild=232.*
66

77
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
88
# See https://jb.gg/intellij-platform-builds-list for available build versions
9-
pluginVerifierIdeVersions=2020.1.1, 2021.1, 2021.2, 2021.3, 2022.2, 2022.3
10-
baseVersion=IC-2021.2
11-
clionVersion=CL-2021.2.1
9+
pluginVerifierIdeVersions=2022.2.5, 2022.3, 2023.1, 2023.2
10+
baseVersion=IC-2023.2
11+
clionVersion=CL-2023.2
1212
platformDownloadSources=true
1313

1414
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
@@ -20,9 +20,14 @@ clionPlugins=com.intellij.cidr.base, com.intellij.clion
2020
kotlin.stdlib.default.dependency=false
2121

2222
# proxy
23-
#systemProp.http.proxyHost=127.0.0.1
24-
#systemProp.http.proxyPort=7890
25-
#systemProp.https.proxyHost=127.0.0.1
26-
#systemProp.https.proxyPort=7890
23+
systemProp.http.proxyHost=127.0.0.1
24+
systemProp.http.proxyPort=7890
25+
systemProp.https.proxyHost=127.0.0.1
26+
systemProp.https.proxyPort=7890
2727

2828

29+
org.gradle.warning.mode=all
30+
kotlin.daemon.jvmargs=-Xmx2048m
31+
32+
# Gradle Releases -> https://github.com/gradle/gradle/releases
33+
gradleVersion = 8.5
+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
5-
zipStorePath=wrapper/dists
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)