Updated gradle to 5.3.1, updated dependencies, and added kotlin support

This commit is contained in:
Obique
2019-04-06 12:23:49 -05:00
parent 894a0f479a
commit 2e6ff3caab
5 changed files with 51 additions and 8 deletions

View File

@@ -6,7 +6,8 @@ plugins {
id 'idea'
id "com.github.johnrengelman.shadow" version "5.0.0"
id "org.javamodularity.moduleplugin" version "1.4.1"
id "org.beryx.jlink" version "2.6.6"
id 'org.jetbrains.kotlin.jvm' version '1.3.21'
id "org.beryx.jlink" version "2.9.0"
}
mainClassName = 'com.projectswg.holocore.ProjectSWG'
@@ -34,6 +35,7 @@ idea {
}
jlink {
addOptions '--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages'
imageDir.set(file("$buildDir/holocore"))
imageZip.set(file("$buildDir/holocore.zip"))
launcher {
@@ -44,7 +46,7 @@ jlink {
}
shadowJar {
archiveBaseName.set("Holocore")
archivesBaseName = 'Holocore'
archiveClassifier.set(null)
archiveVersion.set(null)
}
@@ -56,6 +58,7 @@ repositories {
dependencies {
compile project(':pswgcommon')
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.3.21'
compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.23.1'
compile group: 'org.mongodb', name: 'mongodb-driver-sync', version: '3.9.1'
compile group: 'me.joshlarson', name: "fast-json", version: '3.0.0'
@@ -81,8 +84,16 @@ dependencies {
integrationCompile 'junit:junit:4.12'
}
compileKotlin {
kotlinOptions.jvmTarget = "1.8"
}
compileTestKotlin {
kotlinOptions.jvmTarget = "1.8"
}
task CreateConvertLoginJar(type: ShadowJar) {
archiveBaseName.set("ConvertLogin")
archivesBaseName = "ConvertLogin"
archiveClassifier.set(null)
archiveVersion.set(null)
manifest.attributes 'Main-Class': 'com.projectswg.utility.ConvertLogin'
@@ -92,7 +103,7 @@ task CreateConvertLoginJar(type: ShadowJar) {
}
task CreatePacketCaptureProcessor(type: ShadowJar) {
archiveBaseName.set("PacketCaptureProcessor")
archivesBaseName = "PacketCaptureProcessor"
archiveClassifier.set(null)
archiveVersion.set(null)
manifest.attributes 'Main-Class': 'com.projectswg.utility.packets.ProcessPacketCapture'

Binary file not shown.

View File

@@ -1,6 +1,6 @@
#Sun Mar 10 07:15:04 CDT 2019
#Thu Mar 28 09:08:51 CDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip

18
gradlew vendored
View File

@@ -1,5 +1,21 @@
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m"'
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

18
gradlew.bat vendored
View File

@@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -14,7 +30,7 @@ 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="-Xmx64m"
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome