build: fix latest java version for gitlab build

hcxiong · Jul 6, 2020 · e81ba1c · e81ba1c
1 parent b219ab6
commit e81ba1c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -19,10 +19,10 @@ java-11:
   image: openjdk:11
   script: ./gradlew clean build
 
-java-12:
+java-latest:
   stage: test
-  image: gradle:jdk12 # latest gradle and jdk12
-  script: gradle clean build
+  image: openjdk:latest
+  script: java -version && ./gradlew clean build
 
 check:
   stage: check

diff --git a/build.gradle b/build.gradle
@@ -15,6 +15,9 @@ allprojects {
 
 	version = jadxVersion
 
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
+
 	tasks.withType(JavaCompile) {
 		if (!"$it".contains(':jadx-samples:')) {
 			options.compilerArgs << '-Xlint' << '-Xlint:unchecked' << '-Xlint:deprecation'
@@ -60,7 +63,7 @@ allprojects {
 	}
 
 	jacoco {
-		toolVersion = "0.8.2"
+		toolVersion = "0.8.5"
 	}
 	jacocoTestReport {
 		reports {

diff --git a/jadx-samples/build.gradle b/jadx-samples/build.gradle
@@ -5,7 +5,6 @@ project.ext {
 }
 
 dependencies {
-	compile(project(":jadx-core"))
 	compile(project(":jadx-cli"))
 }
 
@@ -29,7 +28,7 @@ task samplesJar(type: Jar, dependsOn: samplesRun) {
 task samplesJadxCreate(type: JavaExec, dependsOn: samplesJar) {
 	classpath = sourceSets.main.output + configurations.compile
 	main = project(":jadx-cli").mainClassName
-	args = ['-d', samplesJadxSrcDir, samplesJar.archivePath]
+	args = ['-v', '-d', samplesJadxSrcDir, samplesJar.archivePath]
 }
 
 task samplesJadxCompile(type: JavaCompile, dependsOn: samplesJadxCreate) {