From 36432e516e199b5a0602aba6e1a8b97cb5d72777 Mon Sep 17 00:00:00 2001 From: Shevek Date: Fri, 21 Apr 2017 13:53:32 -0700 Subject: Update build system and .gitignore. --- .gitignore | 64 ++++++++++++++++++++++++++++++- build.gradle | 13 ++++++- gradle/buildscript.gradle | 11 ------ gradle/wrapper/gradle-wrapper.jar | Bin 51018 -> 52266 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- 5 files changed, 75 insertions(+), 17 deletions(-) delete mode 100644 gradle/buildscript.gradle diff --git a/.gitignore b/.gitignore index 9d7ac43..7507685 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,64 @@ -build -.*.swp +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log + +# OS generated files # +###################### +.DS_Store* +ehthumbs.db +Icon? +Thumbs.db + +# Editor Files # +################ +*~ +*.swp + +# Gradle Files # +################ .gradle + +# Build output directies +/target +*/target +/build +*/build + +# IntelliJ specific files/directories +out +.idea +*.ipr +*.iws +*.iml +atlassian-ide-plugin.xml + +# Eclipse specific files/directories +.classpath +.project +.settings +.metadata + +# NetBeans specific files/directories +.nbattrs .nb-gradle diff --git a/build.gradle b/build.gradle index 8235df2..a9dd186 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,14 @@ buildscript { - apply from: file('gradle/buildscript.gradle'), to: buildscript + repositories { + // mavenLocal() + mavenCentral() + jcenter() + // maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } + } + + dependencies { + classpath 'org.anarres.gradle:gradle-stdproject-plugin:1.0.8' + } } apply plugin: 'org.anarres.stdproject' @@ -22,7 +31,7 @@ stdproject { } dependencies { - compile 'com.google.code.findbugs:annotations:2.0.3' + compile 'com.google.code.findbugs:annotations:3.0.1' compile 'org.slf4j:slf4j-api:1.7.12' compile 'net.sf.jopt-simple:jopt-simple:4.7' diff --git a/gradle/buildscript.gradle b/gradle/buildscript.gradle deleted file mode 100644 index bc05d97..0000000 --- a/gradle/buildscript.gradle +++ /dev/null @@ -1,11 +0,0 @@ -// Executed in context of buildscript -repositories { - mavenLocal() - mavenCentral() - jcenter() - // maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } -} - -dependencies { - classpath 'org.anarres.gradle:gradle-stdproject-plugin:1.0.4' -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c97a8bd..b5166da 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ed13fe8..62638ad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jun 16 16:26:49 PDT 2015 +#Fri Apr 21 13:50:38 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip -- cgit v1.2.3