Fixed the build script and the gradle wrapper so that we can run sonar with java 1.8.

This commit is contained in:
Mike Spallino 2015-01-16 22:05:18 -05:00
parent 569b693831
commit f1c18b1e63
2 changed files with 5 additions and 6 deletions

View File

@ -15,17 +15,16 @@ if (System.properties['os.name'].toLowerCase().contains('mac')) {
mainClassName = "com.cburch.logisim.Main"
version = '2.7.2'
title = 'Logisim'
applicationName = 'Logisim'
description = 'Logisim: Logic Simulator'
test.scanForTestClasses = false
task wrapper(type: Wrapper) {
gradleVersion = '1.8'
gradleVersion = '2.2'
}
jar {
manifest {
attributes 'Implementation-Title': title,
attributes 'Implementation-Title': applicationName,
'Implementation-Version': version,
'Main-Class': mainClassName
}
@ -46,7 +45,7 @@ buildscript {
}
dependencies {
classpath \
'edu.sc.seis:gradle-launch4j:1.0.5',
'edu.sc.seis.gradle:launch4j:1.0.6',
'net.sourceforge.nekohtml:nekohtml:1.9.18',
'javax.help:javahelp:2.0.05',
'edu.sc.seis.gradle:macappbundle:2.0.0'

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-2.2-bin.zip