update gradle

sybila · Mar 2, 2020 · a3d1e23 · a3d1e23
1 parent 6930551
commit a3d1e23
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,6 @@ build
 *.iws
 
 # Idea project files
-.idea
+.idea
+
+.DS_Store
diff --git a/application/build.gradle b/application/build.gradle
@@ -1,3 +1,4 @@
+apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'application'
 
 mainClassName = 'org.sybila.parasim.application.Main'

diff --git a/build.gradle b/build.gradle
@@ -5,6 +5,7 @@ buildscript {
     }
     dependencies {
         classpath "gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.13.1"
+        classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
     }
 }
 
@@ -36,7 +37,7 @@ allprojects {
         testCompile group: 'junit', name: 'junit', version: '4.11'  
         testCompile 'org.testng:testng:6.9.12'
         compile 'net.jcip:jcip-annotations:1.0'
-        compile 'org.javassist:javassist:3.22.0-CR1'
+        compile 'org.javassist:javassist:3.26.0-GA'
         compile 'org.slf4j:slf4j-log4j12:1.7.2'
         compile 'org.apache.commons:commons-lang3:3.5'
         compile files("${project.rootProject.rootDir}/lib/javaoctave-0.6.4.jar")

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,6 @@ build @@
     *.iws
     # Idea project files
-    .idea
+    .idea
+    .DS_Store