From f6a8ac9aaf8fdc5fe9277f849b9e9c78c2a862c3 Mon Sep 17 00:00:00 2001 From: Torma Date: Thu, 22 Oct 2020 00:12:27 +0200 Subject: [PATCH] use shadow --- build.gradle | 32 +++++++++++++++++++++++++++++--- src/Application.kt | 6 ------ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index d062e3b..bf0c9af 100644 --- a/build.gradle +++ b/build.gradle @@ -2,13 +2,27 @@ buildscript { repositories { jcenter() } + mavenCentral() + maven { + url = uri("https://repo.eclipse.org/content/repositories/paho-releases/") + } + maven { + url = uri("https://plugins.gradle.org/m2/") + } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "com.github.jengelman.gradle.plugins:shadow:5.2.0" } } +tasks.withType(JavaCompile) { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + apply plugin: 'kotlin' +apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'application' group 'com.kmlabz.k8s' @@ -17,9 +31,7 @@ mainClassName = "io.ktor.server.jetty.EngineMain" sourceSets { main.kotlin.srcDirs = main.java.srcDirs = ['src'] - test.kotlin.srcDirs = test.java.srcDirs = ['test'] main.resources.srcDirs = ['resources'] - test.resources.srcDirs = ['testresources'] } repositories { @@ -38,5 +50,19 @@ dependencies { implementation "io.ktor:ktor-client-jetty:$ktor_version" implementation "io.ktor:ktor-client-json-jvm:$ktor_version" implementation "io.ktor:ktor-client-gson:$ktor_version" - testImplementation "io.ktor:ktor-server-tests:$ktor_version" + implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5' } + +kotlin.experimental.coroutines = 'enable' + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlinOptions { + jvmTarget = "11" + } +} + +shadowJar { + baseName = 'mqtt-benchmark-component' + classifier = null + version = null +} \ No newline at end of file diff --git a/src/Application.kt b/src/Application.kt index 284d33d..3acb519 100644 --- a/src/Application.kt +++ b/src/Application.kt @@ -2,21 +2,15 @@ package com.kmlabz.k8s import com.google.gson.Gson import com.google.gson.GsonBuilder -import com.google.gson.internal.GsonBuildConfig import io.ktor.application.* -import io.ktor.response.* -import io.ktor.request.* import io.ktor.client.* import io.ktor.client.engine.jetty.* import io.ktor.client.features.json.* import io.ktor.client.request.* import io.ktor.client.request.forms.* -import io.ktor.client.statement.* import io.ktor.http.* -import io.ktor.http.ContentDisposition.Companion.File import io.ktor.http.content.* import io.ktor.util.* -import io.ktor.utils.io.streams.* import kotlinx.coroutines.* import java.io.File