Skip to content

Commit fc2c6b8

Browse files
committed
🔧 Update gradle version and build script
1 parent 8c3756e commit fc2c6b8

6 files changed

+230
-161
lines changed

build.gradle.kts

+16-19
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2-
31
plugins {
42
java
5-
kotlin("jvm") version "1.3.61"
6-
id("org.jetbrains.intellij") version "0.6.3"
3+
kotlin("jvm") version "1.6.0"
4+
id("org.jetbrains.intellij") version "1.8.0"
75
}
86

97

@@ -20,24 +18,23 @@ dependencies {
2018
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.3.1")
2119
}
2220

23-
configure<JavaPluginConvention> {
24-
sourceCompatibility = JavaVersion.VERSION_1_8
25-
}
26-
27-
tasks.withType<KotlinCompile> {
28-
kotlinOptions.jvmTarget = "1.8"
29-
}
30-
3121

3222
intellij {
33-
version = project.properties["ideaVersion"].toString()
34-
pluginName = "evaluate-async-code"
35-
downloadSources = project.properties["downloadIdeaSources"] == "true"
36-
updateSinceUntilBuild = false
37-
setPlugins("terminal")
23+
version.set(project.properties["ideaVersion"].toString())
24+
pluginName.set("evaluate-async-code")
25+
downloadSources.set(project.properties["downloadIdeaSources"] == "true")
26+
updateSinceUntilBuild.set(false)
27+
plugins.add("terminal")
3828
if ("PC" in project.properties["ideaVersion"].toString()) {
39-
setPlugins("python-ce")
29+
plugins.add("python-ce")
4030
} else if ("PY" in project.properties["ideaVersion"].toString()) {
41-
setPlugins("python")
31+
plugins.add("python")
32+
}
33+
}
34+
35+
tasks {
36+
withType<JavaCompile> {
37+
sourceCompatibility = "11"
38+
targetCompatibility = "11"
4239
}
4340
}

gradle.properties

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
version=2020.1
2-
kotlinVersion=1.3.21
3-
ideaVersion=PY-2020.3.2
4-
pythonPlugin=PythonCore:203.6682.179
1+
version=2022.1
2+
ideaVersion=PY-2022.1.4
3+
pythonPlugin=PythonCore:221.6008.17
54
downloadIdeaSources=true
+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Wed Mar 04 11:16:32 EET 2020
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)