From f60ec9d10fd25c5c9f23389af4c87de4540f1398 Mon Sep 17 00:00:00 2001 From: Robinson Date: Fri, 9 Apr 2021 20:24:45 +0200 Subject: [PATCH] updated libraries, added updates --- README.md | 11 ++++++----- build.gradle.kts | 33 ++++++++++----------------------- src/dorkbox/network/Client.kt | 14 +++++++++----- src/dorkbox/network/Server.kt | 5 +++++ 4 files changed, 30 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 6afa0340..eaecbd48 100644 --- a/README.md +++ b/README.md @@ -87,27 +87,28 @@ client.send() Maven Info --------- -``` +```` ... com.dorkbox Network - 4.0 + 5.0 -``` +```` Gradle Info --------- ```` dependencies { ... - compile 'com.dorkbox:Network:4.0' + implementation("com.dorkbox:Network:5.0") } ```` License --------- -This project is © 2010 dorkbox llc, and is distributed under the terms of the Apache v2.0 License. See file "LICENSE" for further references. +This project is © 2021 dorkbox llc, and is distributed under the terms of the Apache v2.0 License. See file "LICENSE" for further +references. diff --git a/build.gradle.kts b/build.gradle.kts index 948bf00a..c0ad144e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,10 +29,10 @@ gradle.startParameter.warningMode = WarningMode.All plugins { java - id("com.dorkbox.GradleUtils") version "1.12" - id("com.dorkbox.Licensing") version "2.5.2" - id("com.dorkbox.VersionUpdate") version "2.0" - id("com.dorkbox.GradlePublish") version "1.8" + id("com.dorkbox.GradleUtils") version "1.15" + id("com.dorkbox.Licensing") version "2.5.5" + id("com.dorkbox.VersionUpdate") version "2.2" + id("com.dorkbox.GradlePublish") version "1.10" id("com.dorkbox.GradleModuleInfo") version "1.1" kotlin("jvm") version "1.4.10" @@ -148,34 +148,20 @@ licensing { sourceSets { main { - java { - setSrcDirs(listOf("src")) - - // want to include java files for the source. 'setSrcDirs' resets includes... - include("**/*.java") - } - kotlin { setSrcDirs(listOf("src")) - // want to include java files for the source. 'setSrcDirs' resets includes... - include("**/*.java", "**/*.kt") + // want to add files for the source. 'setSrcDirs' resets includes... + include("**/*.kt") } } test { - java { - setSrcDirs(listOf("test")) - - // want to include java files for the source. 'setSrcDirs' resets includes... - include("**/*.java") - } - kotlin { setSrcDirs(listOf("test")) - // want to include java files for the source. 'setSrcDirs' resets includes... - include("**/*.java", "**/*.kt") + // want to add files for the source. 'setSrcDirs' resets includes... + include("**/*.kt") } } } @@ -214,7 +200,7 @@ dependencies { implementation("io.aeron:aeron-driver:$aeronVer") // https://github.com/EsotericSoftware/kryo - implementation("com.esotericsoftware:kryo:5.0.0-RC8") + implementation("com.esotericsoftware:kryo:5.1.0") // https://github.com/magro/kryo-serializers implementation("de.javakaffee:kryo-serializers:0.45") @@ -235,6 +221,7 @@ dependencies { implementation("com.dorkbox:Annotations:3.1") implementation("com.dorkbox:MinLog-SLF4J:2.0") implementation("com.dorkbox:Utilities:1.8.3") + implementation("com.dorkbox:Updates:1.0") implementation("com.dorkbox:NetworkUtils:2.0") implementation("com.dorkbox:ObjectPool:3.1") diff --git a/src/dorkbox/network/Client.kt b/src/dorkbox/network/Client.kt index cdb683a4..48572a30 100644 --- a/src/dorkbox/network/Client.kt +++ b/src/dorkbox/network/Client.kt @@ -21,11 +21,7 @@ import dorkbox.netUtil.IPv6 import dorkbox.network.aeron.AeronConfig import dorkbox.network.aeron.IpcMediaDriverConnection import dorkbox.network.aeron.UdpMediaDriverConnection -import dorkbox.network.connection.Connection -import dorkbox.network.connection.ConnectionParams -import dorkbox.network.connection.EndPoint -import dorkbox.network.connection.ListenerManager -import dorkbox.network.connection.PublicKeyValidationState +import dorkbox.network.connection.* import dorkbox.network.coroutines.SuspendWaiter import dorkbox.network.exceptions.ClientException import dorkbox.network.exceptions.ClientRejectedException @@ -35,6 +31,7 @@ import dorkbox.network.rmi.RemoteObject import dorkbox.network.rmi.RemoteObjectStorage import dorkbox.network.rmi.RmiManagerConnections import dorkbox.network.rmi.TimeoutException +import dorkbox.updates.Updates.add import dorkbox.util.Sys import kotlinx.atomicfu.atomic import kotlinx.coroutines.CoroutineStart @@ -53,6 +50,13 @@ open class Client(config: Configuration = Configuration * Gets the version number. */ const val version = "5.0" + + init { + // Add this project to the updates system, which verifies this class + UUID + version information + + // Add this project to the updates system, which verifies this class + UUID + version information + add(Client::class.java, "5be42ae40cac49fb90dea86bc513141b", version) + } } /** diff --git a/src/dorkbox/network/Server.kt b/src/dorkbox/network/Server.kt index d854ac5a..1e5b3cab 100644 --- a/src/dorkbox/network/Server.kt +++ b/src/dorkbox/network/Server.kt @@ -78,6 +78,11 @@ open class Server(config: ServerConfiguration = ServerC return AeronConfig.isRunning(configuration.context!!) } + + init { + // Add this project to the updates system, which verifies this class + UUID + version information + dorkbox.updates.Updates.add(Server::class.java, "90a2c3b1e4fa41ea90d31fbdf8b2c6ef", version) + } } /**