Java 8 target for JPS plugins (#102)

* OpenJDK 8 in CI Plus latest stable IntelliJ * targetCompatibility * sourceCompatibility
fkorotkov · Jan 2, 2021 · b13b70b · b13b70b
1 parent 2571b09
commit b13b70b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -1,15 +1,15 @@
 container:
-  image: gradle:jdk11
+  image: openjdk:11
 
 task:
   name: Tests
-  build_script: gradle classes testClasses
-  test_script: gradle test
+  build_script: ./gradlew classes testClasses
+  test_script: ./gradlew test
 
 task:
   name: Publish
   only_if: $CIRRUS_TAG != ''
   depends_on: Tests
   env:
     JETBRAINS_TOKEN: ENCRYPTED[260a01be940eee2f33c35c8f069067b73c34244f297088843ad96d21c4062469d3628989d768056a5e42eb4e07f31c6b]
-  test_script: gradle :thrift:publishPlugin
+  test_script: ./gradlew :thrift:publishPlugin
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,7 @@
 plugins {
-    id "org.jetbrains.intellij" version "0.6.1"
+    id "org.jetbrains.intellij" version "0.6.5"
 }
 
-version = "${version}.$buildNumber"
 subprojects {
     apply plugin: 'java'
     tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,4 @@
-ideaVersion = 203-EAP-SNAPSHOT
-buildNumber = SNAPSHOT
+ideaVersion = IC-2020.3.1
 sources = true
 isEAP = false
 

diff --git a/jps-plugin/build.gradle b/jps-plugin/build.gradle
@@ -1 +1,6 @@
-jar.archiveName = "thrift-jps.jar"
+jar.archiveName = "thrift-jps.jar"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}