Skip to content

Commit

Permalink
configuration enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
hsz committed May 21, 2018
1 parent 2ea3f69 commit f9e7c48
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 19 deletions.
19 changes: 3 additions & 16 deletions build.gradle
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins { plugins {
id 'jacoco' id 'jacoco'
id 'org.jetbrains.intellij' version '0.3.1' id 'org.jetbrains.intellij' version '0.3.1'
id 'de.undercouch.download' version '3.4.2' id 'de.undercouch.download' version '3.4.3'
id 'com.github.kt3k.coveralls' version '2.8.2' id 'com.github.kt3k.coveralls' version '2.8.2'
} }


Expand Down Expand Up @@ -197,21 +197,8 @@ clean.doFirst {


tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.encoding = 'UTF-8' options.encoding = 'UTF-8'

options.incremental = true
if (!Boolean.valueOf(System.getenv('CI'))) { options.fork = true
def javaHome = System.getenv("JAVA_HOME")
if (null == javaHome || "".equals(javaHome)) {
javaHome = JDK6_HOME
}

options.bootClasspath = "$javaHome/jre/lib/rt.jar"
}
}

afterEvaluate {
tasks.getByName('runIde') {
jvmArgs(javaArguments)
}
} }


compileJava.dependsOn generateSources compileJava.dependsOn generateSources
5 changes: 3 additions & 2 deletions gradle.properties
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ ideaVersion = 2018.1
ideaType = IC ideaType = IC
javaVersion = 1.6 javaVersion = 1.6
javaTargetVersion = 1.6 javaTargetVersion = 1.6
javaArguments = -agentpath:/home/hsz/IDE/yjp-2017.02/bin/linux-x86-64/libyjpagent.so javaArguments =
#javaArguments = -agentpath:/home/hsz/IDE/yjp-2017.02/bin/linux-x86-64/libyjpagent.so
sources = true sources = true
isEAP = false isEAP = false
runGenerators = true runGenerators = true
Expand All @@ -23,4 +24,4 @@ publishChannel =
org.gradle.jvmargs=-XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx1024m -Dfile.encoding=utf-8 org.gradle.jvmargs=-XX:MaxPermSize=512m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx1024m -Dfile.encoding=utf-8
JDK6_HOME=/usr/lib/jvm/java-6-jdk/ JDK6_HOME=/usr/lib/jvm/java-6-jdk/


idePath = /home/hsz/IDE/idea-IU-181.4203.550 idePath =
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip

0 comments on commit f9e7c48

Please sign in to comment.