Полная миграция в Gradle проект

.travis.yml

@@ -14,5 +14,5 @@ before_install:
  - chmod +x gradlew
  
 after_success:
- - ./gradlew dist
+ - ./gradlew proguard
  - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "latest" && curl -F "file=@dist/Own-Programming-Language-Tutorial.jar" http://projects.annimon.com/samples/php/travis/upload.php?mode=ownlang

build.gradle

@@ -1,11 +1,23 @@
-apply plugin: "java"
+apply plugin: 'java'
 
 sourceCompatibility = '1.8'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-project.ext.mainClass = 'com.annimon.ownlang.Main'
 
-dependencies{
+if (!hasProperty('mainClass')) {
-    compile fileTree(dir: 'libs', include: '*.jar')
+    ext.mainClass = 'com.annimon.ownlang.Main'
+}
+
+repositories {
+    jcenter()
+}
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'net.sf.proguard:proguard-gradle:5.2.1'
+    }
 }
 
 task run(dependsOn: classes, type: JavaExec) {
@@ -15,23 +27,35 @@ task run(dependsOn: classes, type: JavaExec) {
     ignoreExitValue = true
 }
 
+task runOptimizing(dependsOn: classes, type: JavaExec) {
+    main = project.mainClass
+    classpath = sourceSets.main.runtimeClasspath
+    ignoreExitValue = true
+    args '-o 9 -m -a -f program.own'.split(' ')
+}
+
 task dist(dependsOn: classes, type: Jar) {
     from files(sourceSets.main.output.classesDir)
     from {configurations.compile.collect {zipTree(it)}}
     from files(sourceSets.main.resources)
     libsDirName = "$rootProject.projectDir/dist"
-    
+
     manifest {
         attributes 'Main-Class': project.mainClass
     }
 }
 
-repositories {
+task proguard(dependsOn: dist, type: proguard.gradle.ProGuardTask) {
-    jcenter()
+    configuration "$rootProject.projectDir/proguard.properties"
+    injars "$rootProject.projectDir/dist/OwnLang.jar"
+    outjars "$rootProject.projectDir/store/OwnLang.jar"
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile 'com.squareup.okhttp3:okhttp:3.4.1'
-    testCompile group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.12'
+    compile 'org.json:json:20160212'
-    testCompile group: 'org.openjdk.jmh', name: 'jmh-generator-annprocess', version: '1.12'
+
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.openjdk.jmh:jmh-core:1.12'
+    testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.12'
 }

build.xml

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
-<project name="OwnLang" default="default" basedir=".">
-    <description>Builds, tests, and runs the project OwnLang.</description>
-    <import file="nbproject/build-impl.xml"/>
-    
-    <target name="pack" depends="jar">
-        <property name="store.jar.name" value="${application.title}"/>
-        <property name="proguard.jar.path" value="store/proguard.jar" />
- 
-        <property name="store.dir" value="store"/>
-        <property name="store.jar" value="${store.dir}/${store.jar.name}.jar"/>
-        <property name="obfuscated.jar" value="${store.dir}/${store.jar.name}-obfuscated.jar"/>
-
-        <echo message="Packaging ${application.title} into a single JAR at ${store.jar}"/>
-
-        <delete file="${store.jar}"/>
-        <delete file="${obfuscated.jar}"/>
-        <mkdir dir="${store.dir}"/>
-
-        <jar destfile="${store.dir}/temp_final.jar" filesetmanifest="skip">
-            <zipgroupfileset dir="dist" includes="*.jar"/>
-            <zipgroupfileset dir="dist/lib" includes="*.jar"/>
-
-            <manifest>
-                <attribute name="Main-Class" value="${main.class}"/>
-            </manifest>
-        </jar>
-
-        <zip destfile="${store.jar}">
-            <zipfileset src="${store.dir}/temp_final.jar"
-           excludes="META-INF/*.SF, META-INF/*.DSA, META-INF/*.RSA"/>
-        </zip>
-
-        <delete file="${store.dir}/temp_final.jar"/>
-        
-        
-        <echo message="Obfuscating ${store.jar}..." />
-        
-        <taskdef resource="proguard/ant/task.properties"
-                 classpath="${proguard.jar.path}" />
-
-        <proguard configuration="proguard.properties">
-
-            <injar  file="${store.jar}" />
-            <outjar file="${store.dir}/temp_final.jar" />
-
-            <libraryjar path="${javac.classpath}" />
-            <libraryjar file="${java.home}/lib/rt.jar" />
-            <libraryjar file="${java.home}/lib/ext/jfxrt.jar" />
-        </proguard>
-        
-        <move file="${store.dir}/temp_final.jar" tofile="${obfuscated.jar}"/>
-    </target>
-    
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar:                  JAR building
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="OwnLang-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>

nbproject/genfiles.properties

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=48c1b1a1
-build.xml.script.CRC32=dd12e417
-build.xml.stylesheet.CRC32=8064a381@1.78.0.48
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=48c1b1a1
-nbproject/build-impl.xml.script.CRC32=7fd56607
-nbproject/build-impl.xml.stylesheet.CRC32=2b19b096@1.80.0.48

nbproject/project.properties

@@ -1,85 +0,0 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=OwnLang
-application.vendor=aNNiMON
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/OwnLang.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.json-20151123.jar=libs/json-20151123.jar
-file.reference.okhttp-3.1.2.jar=libs/okhttp-3.1.2.jar
-file.reference.okio-1.6.0.jar=libs/okio-1.6.0.jar
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${file.reference.json-20151123.jar}:\
-    ${file.reference.okhttp-3.1.2.jar}:\
-    ${file.reference.okio-1.6.0.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.external.vm=true
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit_4.classpath}:\
-    ${libs.hamcrest.classpath}:\
-    ${libs.JMH_1.12.classpath}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=com.annimon.ownlang.Main
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src/main/java
-test.src.dir=src/test/java

nbproject/project.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>OwnLang</name>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>

proguard.properties

@@ -1,4 +1,6 @@
 -target 1.8
+-libraryjars <java.home>/lib/rt.jar
+-libraryjars <java.home>/lib/ext/jfxrt.jar
 
 -printmapping store/out.map
 -printusage store/out.txt

settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'OwnLang'