Skip to content

Commit e7da3f7

Browse files
CopilotMte90
andcommitted
Upgrade to latest versions: Gradle 9.2.0, Kotlin 2.2.0, IntelliJ plugin 2.1.2
Co-authored-by: Mte90 <403283+Mte90@users.noreply.github.com>
1 parent 5638b8b commit e7da3f7

File tree

5 files changed

+19
-265
lines changed

5 files changed

+19
-265
lines changed

.github/workflows/kotlin-ci.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,21 @@ jobs:
3939
restore-keys: |
4040
gradle-${{ matrix.java-version }}-
4141
42-
- name: Setup Gradle wrapper jar if missing
42+
- name: Setup Gradle wrapper if missing
4343
run: |
44-
if [ ! -f gradle/wrapper/gradle-wrapper.jar ]; then
45-
echo "Setting up gradle-wrapper.jar for Gradle 8.4..."
44+
if [ ! -f gradlew ] || [ ! -f gradle/wrapper/gradle-wrapper.jar ]; then
45+
echo "Setting up Gradle wrapper for Gradle 9.2.0..."
4646
cd /tmp
47-
curl -L -s -o gradle-8.4.zip https://services.gradle.org/distributions/gradle-8.4-bin.zip
48-
unzip -q gradle-8.4.zip
47+
curl -L -s -o gradle-9.2.0.zip https://services.gradle.org/distributions/gradle-9.2.0-bin.zip
48+
unzip -q gradle-9.2.0.zip
4949
mkdir -p $GITHUB_WORKSPACE/ide-plugins/gradle/wrapper
50-
cp gradle-8.4/lib/plugins/gradle-wrapper-8.4.jar $GITHUB_WORKSPACE/ide-plugins/gradle/wrapper/gradle-wrapper.jar
51-
echo "Wrapper jar installed"
50+
cp gradle-9.2.0/gradle/wrapper/gradle-wrapper.jar $GITHUB_WORKSPACE/ide-plugins/gradle/wrapper/gradle-wrapper.jar || \
51+
cp gradle-9.2.0/lib/plugins/gradle-wrapper-9.2.0.jar $GITHUB_WORKSPACE/ide-plugins/gradle/wrapper/gradle-wrapper.jar
52+
cp gradle-9.2.0/gradlew $GITHUB_WORKSPACE/ide-plugins/gradlew
53+
chmod +x $GITHUB_WORKSPACE/ide-plugins/gradlew
54+
echo "Wrapper installed"
5255
fi
5356
54-
- name: Make wrapper executable
55-
run: chmod +x ./gradlew
56-
working-directory: ide-plugins
57-
5857
- name: Print Gradle info (for debugging)
5958
run: ./gradlew --no-daemon --version
6059
working-directory: ide-plugins

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ __pycache__
99
# Gradle build artifacts
1010
ide-plugins/.gradle/
1111
ide-plugins/build/
12-
# Gradle wrapper jar (generated on first run)
12+
# Gradle wrapper files (generated on first run)
1313
ide-plugins/gradle/wrapper/gradle-wrapper.jar
14+
ide-plugins/gradlew
15+
ide-plugins/gradlew.bat

ide-plugins/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id("java")
3-
id("org.jetbrains.kotlin.jvm") version "2.0.21"
4-
id("org.jetbrains.intellij") version "1.15.0"
3+
id("org.jetbrains.kotlin.jvm") version "2.2.0"
4+
id("org.jetbrains.intellij") version "2.1.2"
55
}
66

77
group = "com.picocode"
@@ -29,7 +29,9 @@ tasks {
2929
}
3030

3131
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
32-
kotlinOptions.jvmTarget = "17"
32+
compilerOptions {
33+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
34+
}
3335
}
3436

3537
patchPluginXml {

ide-plugins/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

ide-plugins/gradlew

Lines changed: 0 additions & 249 deletions
This file was deleted.

0 commit comments

Comments
 (0)