Skip to content

Commit

Permalink
re-set build.gradle to before kotlin-for-jvm, isolating upgrade of …
Browse files Browse the repository at this point in the history
…gradle
  • Loading branch information
jack-bolles committed Aug 7, 2023
1 parent bfbd2d1 commit e7e4920
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,12 @@ buildscript {
}
}

plugins {
id 'org.jetbrains.kotlin.jvm' version '1.8.0'
}

/**
* If `android` is true, the project will be configured as an Android rather than a Java library. This isn't used
* for building archives (such as an APK), but is useful for performing Android checks like lint.
*/
if (!project.hasProperty("android")) {
// apply plugin: 'java'
apply plugin: 'java'
apply plugin: 'checkstyle'
apply plugin: 'jacoco'
apply plugin: 'me.champeau.jmh'
Expand Down Expand Up @@ -52,15 +48,6 @@ compileTestJava {
options.compilerArgs << "-Xlint:deprecation"
}

compileKotlin {
kotlinOptions.jvmTarget = '1.8'
}

compileTestKotlin {
kotlinOptions.jvmTarget = '1.8'
}


targetCompatibility = '1.8'
sourceCompatibility = '1.8'

Expand Down Expand Up @@ -187,4 +174,4 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation 'net.sf.kxml:kxml2:2.3.0'
testImplementation 'org.hamcrest:hamcrest-all:1.3'
}
}

0 comments on commit e7e4920

Please sign in to comment.