From b13b70bd838aa2f37cb622a8964f29fd75865f36 Mon Sep 17 00:00:00 2001
From: Fedor Korotkov <fedor@cirruslabs.org>
Date: Sat, 2 Jan 2021 11:12:36 -0500
Subject: [PATCH] Java 8 target for JPS plugins (#102)

* OpenJDK 8 in CI

Plus latest stable IntelliJ

* targetCompatibility

* sourceCompatibility
---
 .cirrus.yml             | 8 ++++----
 build.gradle            | 3 +--
 gradle.properties       | 3 +--
 jps-plugin/build.gradle | 7 ++++++-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index c8c95765..78ad8cd9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,10 +1,10 @@
 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
@@ -12,4 +12,4 @@ task:
   depends_on: Tests
   env:
     JETBRAINS_TOKEN: ENCRYPTED[260a01be940eee2f33c35c8f069067b73c34244f297088843ad96d21c4062469d3628989d768056a5e42eb4e07f31c6b]
-  test_script: gradle :thrift:publishPlugin
\ No newline at end of file
+  test_script: ./gradlew :thrift:publishPlugin
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a05077fa..25fdc2a3 100644
--- 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
index ba9926a5..e3cd463f 100644
--- 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
index 00370c77..5705b8e5 100644
--- a/jps-plugin/build.gradle
+++ b/jps-plugin/build.gradle
@@ -1 +1,6 @@
-jar.archiveName = "thrift-jps.jar"
\ No newline at end of file
+jar.archiveName = "thrift-jps.jar"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
\ No newline at end of file