updated libraries, added updates
This commit is contained in:
parent
bb77a17158
commit
f60ec9d10f
11
README.md
11
README.md
|
@ -87,27 +87,28 @@ client.send()
|
||||||
|
|
||||||
Maven Info
|
Maven Info
|
||||||
---------
|
---------
|
||||||
```
|
````
|
||||||
<dependencies>
|
<dependencies>
|
||||||
...
|
...
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.dorkbox</groupId>
|
<groupId>com.dorkbox</groupId>
|
||||||
<artifactId>Network</artifactId>
|
<artifactId>Network</artifactId>
|
||||||
<version>4.0</version>
|
<version>5.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
```
|
````
|
||||||
|
|
||||||
Gradle Info
|
Gradle Info
|
||||||
---------
|
---------
|
||||||
````
|
````
|
||||||
dependencies {
|
dependencies {
|
||||||
...
|
...
|
||||||
compile 'com.dorkbox:Network:4.0'
|
implementation("com.dorkbox:Network:5.0")
|
||||||
}
|
}
|
||||||
````
|
````
|
||||||
|
|
||||||
License
|
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.
|
||||||
|
|
||||||
|
|
|
@ -29,10 +29,10 @@ gradle.startParameter.warningMode = WarningMode.All
|
||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
|
|
||||||
id("com.dorkbox.GradleUtils") version "1.12"
|
id("com.dorkbox.GradleUtils") version "1.15"
|
||||||
id("com.dorkbox.Licensing") version "2.5.2"
|
id("com.dorkbox.Licensing") version "2.5.5"
|
||||||
id("com.dorkbox.VersionUpdate") version "2.0"
|
id("com.dorkbox.VersionUpdate") version "2.2"
|
||||||
id("com.dorkbox.GradlePublish") version "1.8"
|
id("com.dorkbox.GradlePublish") version "1.10"
|
||||||
id("com.dorkbox.GradleModuleInfo") version "1.1"
|
id("com.dorkbox.GradleModuleInfo") version "1.1"
|
||||||
|
|
||||||
kotlin("jvm") version "1.4.10"
|
kotlin("jvm") version "1.4.10"
|
||||||
|
@ -148,34 +148,20 @@ licensing {
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
java {
|
|
||||||
setSrcDirs(listOf("src"))
|
|
||||||
|
|
||||||
// want to include java files for the source. 'setSrcDirs' resets includes...
|
|
||||||
include("**/*.java")
|
|
||||||
}
|
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
setSrcDirs(listOf("src"))
|
setSrcDirs(listOf("src"))
|
||||||
|
|
||||||
// want to include java files for the source. 'setSrcDirs' resets includes...
|
// want to add files for the source. 'setSrcDirs' resets includes...
|
||||||
include("**/*.java", "**/*.kt")
|
include("**/*.kt")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
java {
|
|
||||||
setSrcDirs(listOf("test"))
|
|
||||||
|
|
||||||
// want to include java files for the source. 'setSrcDirs' resets includes...
|
|
||||||
include("**/*.java")
|
|
||||||
}
|
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
setSrcDirs(listOf("test"))
|
setSrcDirs(listOf("test"))
|
||||||
|
|
||||||
// want to include java files for the source. 'setSrcDirs' resets includes...
|
// want to add files for the source. 'setSrcDirs' resets includes...
|
||||||
include("**/*.java", "**/*.kt")
|
include("**/*.kt")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -214,7 +200,7 @@ dependencies {
|
||||||
implementation("io.aeron:aeron-driver:$aeronVer")
|
implementation("io.aeron:aeron-driver:$aeronVer")
|
||||||
|
|
||||||
// https://github.com/EsotericSoftware/kryo
|
// 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
|
// https://github.com/magro/kryo-serializers
|
||||||
implementation("de.javakaffee:kryo-serializers:0.45")
|
implementation("de.javakaffee:kryo-serializers:0.45")
|
||||||
|
@ -235,6 +221,7 @@ dependencies {
|
||||||
implementation("com.dorkbox:Annotations:3.1")
|
implementation("com.dorkbox:Annotations:3.1")
|
||||||
implementation("com.dorkbox:MinLog-SLF4J:2.0")
|
implementation("com.dorkbox:MinLog-SLF4J:2.0")
|
||||||
implementation("com.dorkbox:Utilities:1.8.3")
|
implementation("com.dorkbox:Utilities:1.8.3")
|
||||||
|
implementation("com.dorkbox:Updates:1.0")
|
||||||
implementation("com.dorkbox:NetworkUtils:2.0")
|
implementation("com.dorkbox:NetworkUtils:2.0")
|
||||||
implementation("com.dorkbox:ObjectPool:3.1")
|
implementation("com.dorkbox:ObjectPool:3.1")
|
||||||
|
|
||||||
|
|
|
@ -21,11 +21,7 @@ import dorkbox.netUtil.IPv6
|
||||||
import dorkbox.network.aeron.AeronConfig
|
import dorkbox.network.aeron.AeronConfig
|
||||||
import dorkbox.network.aeron.IpcMediaDriverConnection
|
import dorkbox.network.aeron.IpcMediaDriverConnection
|
||||||
import dorkbox.network.aeron.UdpMediaDriverConnection
|
import dorkbox.network.aeron.UdpMediaDriverConnection
|
||||||
import dorkbox.network.connection.Connection
|
import dorkbox.network.connection.*
|
||||||
import dorkbox.network.connection.ConnectionParams
|
|
||||||
import dorkbox.network.connection.EndPoint
|
|
||||||
import dorkbox.network.connection.ListenerManager
|
|
||||||
import dorkbox.network.connection.PublicKeyValidationState
|
|
||||||
import dorkbox.network.coroutines.SuspendWaiter
|
import dorkbox.network.coroutines.SuspendWaiter
|
||||||
import dorkbox.network.exceptions.ClientException
|
import dorkbox.network.exceptions.ClientException
|
||||||
import dorkbox.network.exceptions.ClientRejectedException
|
import dorkbox.network.exceptions.ClientRejectedException
|
||||||
|
@ -35,6 +31,7 @@ import dorkbox.network.rmi.RemoteObject
|
||||||
import dorkbox.network.rmi.RemoteObjectStorage
|
import dorkbox.network.rmi.RemoteObjectStorage
|
||||||
import dorkbox.network.rmi.RmiManagerConnections
|
import dorkbox.network.rmi.RmiManagerConnections
|
||||||
import dorkbox.network.rmi.TimeoutException
|
import dorkbox.network.rmi.TimeoutException
|
||||||
|
import dorkbox.updates.Updates.add
|
||||||
import dorkbox.util.Sys
|
import dorkbox.util.Sys
|
||||||
import kotlinx.atomicfu.atomic
|
import kotlinx.atomicfu.atomic
|
||||||
import kotlinx.coroutines.CoroutineStart
|
import kotlinx.coroutines.CoroutineStart
|
||||||
|
@ -53,6 +50,13 @@ open class Client<CONNECTION : Connection>(config: Configuration = Configuration
|
||||||
* Gets the version number.
|
* Gets the version number.
|
||||||
*/
|
*/
|
||||||
const val version = "5.0"
|
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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -78,6 +78,11 @@ open class Server<CONNECTION : Connection>(config: ServerConfiguration = ServerC
|
||||||
|
|
||||||
return AeronConfig.isRunning(configuration.context!!)
|
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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue