Commit 2d2641a6 authored by Remi Forax's avatar Remi Forax

Merge branch 'make-asm-compatible-with-javac-12' into 'master'

javac 12 doesn't support -source 1.6 and -target 1.6, so bump to 1.7

See merge request !208
parents 27ec203e f96fe264
Pipeline #2800 failed with stage
in 1 minute and 55 seconds
...@@ -44,8 +44,8 @@ subprojects { ...@@ -44,8 +44,8 @@ subprojects {
def snapshotSuffix = rootProject.hasProperty('release') ? '' : '-SNAPSHOT' def snapshotSuffix = rootProject.hasProperty('release') ? '' : '-SNAPSHOT'
group = 'org.ow2.asm' group = 'org.ow2.asm'
version = '7.0-beta' + snapshotSuffix version = '7.0-beta' + snapshotSuffix
sourceCompatibility = '1.6' sourceCompatibility = '1.7'
targetCompatibility = '1.6' targetCompatibility = '1.7'
test { useJUnitPlatform() } test { useJUnitPlatform() }
ext.provides = [] // The provided java packages, e.g. ['org.objectweb.asm'] ext.provides = [] // The provided java packages, e.g. ['org.objectweb.asm']
ext.requires = [] // The required Gradle projects, e.g. [':asm-test'] ext.requires = [] // The required Gradle projects, e.g. [':asm-test']
...@@ -169,7 +169,7 @@ project(':tools:retrofitter') { ...@@ -169,7 +169,7 @@ project(':tools:retrofitter') {
// Project tasks creation and configuration // Project tasks creation and configuration
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// All projects use Java 1.6 and are tested with :asm-test and JUnit. // All projects use Java 1.7 and are tested with :asm-test and JUnit.
subprojects { subprojects {
apply plugin: 'com.github.sherter.google-java-format' apply plugin: 'com.github.sherter.google-java-format'
googleJavaFormat.exclude 'src/resources/java/**/*' googleJavaFormat.exclude 'src/resources/java/**/*'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment