Browse Source

Update http4k's dependencies (#3107)

Most importantly, update the kotlin and gradle versions for compatibility
with Java 9.

The original gradle-one-jar plugin is not maintained and is not
compatible with gradle 4, so we're now using a fork.

Other dependencies were updated just because.

It seems like there is a newer version of http4k itself available, 3.1.3.
I didn't attempt that upgrade because I assumed it would require
non-trivial changes to the test implementation.
Michael Hixson 7 years ago
parent
commit
a17248ef4b

+ 2 - 0
frameworks/Kotlin/http4k/.gitignore

@@ -1,3 +1,5 @@
+.gradle
+build/
 target/
 project/target
 bin/

+ 5 - 5
frameworks/Kotlin/http4k/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = "1.1.50"
+    ext.kotlin_version = "1.2.0"
     ext.http4k_version = "2.37.0"
 
     repositories {
@@ -9,14 +9,14 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.rholder:gradle-one-jar:1.0.4'
+        classpath 'com.github.onslip:gradle-one-jar:1.0.5'
     }
 }
 
 plugins {
     id "com.jfrog.bintray" version "1.7.3"
-    id 'net.saliman.cobertura' version '2.4.0'
-    id 'com.github.kt3k.coveralls' version '2.8.1'
+    id 'net.saliman.cobertura' version '2.5.2'
+    id 'com.github.kt3k.coveralls' version '2.8.2'
 }
 
 allprojects {
@@ -37,7 +37,7 @@ allprojects {
 
     compileTestKotlin {
         kotlinOptions {
-            languageVersion = "1.1"
+            languageVersion = "1.2"
         }
     }
 }

+ 4 - 3
frameworks/Kotlin/http4k/core/build.gradle

@@ -1,9 +1,10 @@
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     compile "org.http4k:http4k-core:$http4k_version"
     compile "org.http4k:http4k-format-jackson:$http4k_version"
     compile "org.http4k:http4k-template-handlebars:$http4k_version"
-    compile "org.apache.commons:commons-lang3:3.5"
-    compile "com.zaxxer:HikariCP:2.6.1"
-    compile "org.postgresql:postgresql:42.0.0"
+    compile "org.apache.commons:commons-lang3:3.7"
+    compile "com.zaxxer:HikariCP:2.7.4"
+    compile "org.postgresql:postgresql:42.1.4"
 }

BIN
frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.jar


+ 2 - 2
frameworks/Kotlin/http4k/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon May 08 13:42:30 BST 2017
+#Thu Nov 30 09:10:45 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip

+ 84 - 0
frameworks/Kotlin/http4k/gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega