From 8931405ee92092d0615b6c1a42898cfb9befea6d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 13 Sep 2019 01:00:50 -0700 Subject: [PATCH] Updated dependencies. --- .idea/modules/mobibot.iml | 25 +++--- build.gradle | 6 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 +- mobibot.ipr | 96 +++++++++--------------- 5 files changed, 55 insertions(+), 78 deletions(-) diff --git a/.idea/modules/mobibot.iml b/.idea/modules/mobibot.iml index 2113f38..f0bdc97 100644 --- a/.idea/modules/mobibot.iml +++ b/.idea/modules/mobibot.iml @@ -1,5 +1,5 @@ - + @@ -19,38 +19,37 @@ - - - + + + - + - + + + - - - + - + - - + + - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9310af6..cf21967 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'jacoco' id 'java' id 'pmd' - id "com.github.ben-manes.versions" version "0.24.0" + id "com.github.ben-manes.versions" version "0.25.0" id "com.github.spotbugs" version "2.0.0" id "net.thauvin.erik.gradle.semver" version "1.0.4" id "org.sonarqube" version "2.7.1" @@ -50,7 +50,7 @@ dependencies { compile 'commons-cli:commons-cli:1.4' compile 'commons-net:commons-net:3.6' - compile 'com.squareup.okhttp3:okhttp:4.1.1' + compile 'com.squareup.okhttp3:okhttp:4.2.0' compile 'com.rometools:rome:1.12.1' @@ -108,7 +108,7 @@ jar { manifest.attributes('Main-Class': mainClassName, 'Class-Path': '. ./lib/' + configurations.compile.collect { it.getName() }.join(' ./lib/')) - version = null + archiveVersion.set("") } clean { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b7e1f3..7c4388a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 8e25e6c..83f2acf 100755 --- a/gradlew +++ b/gradlew @@ -125,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/mobibot.ipr b/mobibot.ipr index ccfa327..49557ed 100644 --- a/mobibot.ipr +++ b/mobibot.ipr @@ -1060,9 +1060,12 @@ + - - - - + @@ -1504,13 +1491,13 @@ - + - + - + @@ -1594,49 +1581,40 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - + @@ -1648,40 +1626,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -1693,13 +1671,13 @@ - + - + - + @@ -1720,13 +1698,13 @@ - + - + - +