Browse Source

Update hexagon dependencies (#3103)

Most importantly, update the kotlin and gradle versions to versions that
should be compatible with Java 9.

I added the javax.activation dependency to fix an issue running on Java
9, as the comment in build.gradle explains.  There is probably another
way of accomplishing this, like with "--add-modules java.activation" or
whatever it is you can do with the java command, but I don't know what
the equivalent of that incantation is in gradle/kotlin land.

I could not figure out how to upgrade the framework itself to the latest
version.  It seems that some of the framework's submodules have been
renamed.
Michael Hixson 7 years ago
parent
commit
5ba12e3351

+ 6 - 1
frameworks/Kotlin/hexagon/build.gradle

@@ -1,6 +1,6 @@
 
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.1.4-2'
+    id 'org.jetbrains.kotlin.jvm' version '1.2.0'
 }
 
 apply from: "$gradleScripts/kotlin.gradle"
@@ -32,6 +32,11 @@ dependencies {
     compile ("com.zaxxer:HikariCP:$hikariVersion")
     compile ("org.postgresql:postgresql:$postgresqlVersion")
 
+    // hexagon's UndertowEngine class depends on javax.activation.MimetypesFileTypeMap,
+    // which is not available by default in Java 9.  Including this javax.activation
+    // dependency fixes that issue with running on Java 9.
+    compile ("com.sun.activation:javax.activation:$activationVersion")
+
     // providedCompile excludes the dependency only in the WAR, not in the distribution
     providedCompile ("org.eclipse.jetty:jetty-webapp:$jettyVersion") { exclude module: "slf4j-api" }
 

+ 8 - 7
frameworks/Kotlin/hexagon/gradle.properties

@@ -1,11 +1,12 @@
-ahcVersion=2.0.31
+activationVersion=1.2.0
+ahcVersion=2.0.37
 description=Hexagon web framework's benchmark
 gradleScripts=https\://raw.githubusercontent.com/hexagonkt/hexagon/0.20.0/gradle
 hexagonVersion=0.20.0
-hikariVersion=2.6.2
-jettyVersion=9.4.6.v20170531
-kotlinVersion=1.1.4-2
+hikariVersion=2.7.4
+jettyVersion=9.4.8.v20171121
+kotlinVersion=1.2.0
 logbackVersion=1.2.3
-mongodbVersion=3.4.2
-postgresqlVersion=42.0.0
-testngVersion=6.11
+mongodbVersion=3.5.0
+postgresqlVersion=42.1.4
+testngVersion=6.13.1

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


+ 1 - 2
frameworks/Kotlin/hexagon/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Jun 06 01:23:02 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip

+ 3 - 3
frameworks/Kotlin/hexagon/gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }