Updated libraries, version
This commit is contained in:
parent
f43ea6ea19
commit
1a7b74f49c
@ -37,7 +37,7 @@ object Extras {
|
|||||||
// set for the project
|
// set for the project
|
||||||
const val description = "Utilities for use within Java projects"
|
const val description = "Utilities for use within Java projects"
|
||||||
const val group = "com.dorkbox"
|
const val group = "com.dorkbox"
|
||||||
const val version = "1.27"
|
const val version = "1.28"
|
||||||
|
|
||||||
// set as project.ext
|
// set as project.ext
|
||||||
const val name = "Utilities"
|
const val name = "Utilities"
|
||||||
@ -161,8 +161,9 @@ tasks.jar.get().apply {
|
|||||||
dependencies {
|
dependencies {
|
||||||
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
|
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
|
||||||
|
|
||||||
api("com.dorkbox:Collections:1.0")
|
api("com.dorkbox:Collections:1.1")
|
||||||
api("com.dorkbox:Executor:3.9")
|
api("com.dorkbox:Executor:3.9")
|
||||||
|
api("com.dorkbox:NetworkUtils:2.17")
|
||||||
api("com.dorkbox:OS:1.0")
|
api("com.dorkbox:OS:1.0")
|
||||||
api("com.dorkbox:Updates:1.1")
|
api("com.dorkbox:Updates:1.1")
|
||||||
|
|
||||||
@ -176,7 +177,7 @@ dependencies {
|
|||||||
api("com.fasterxml.uuid:java-uuid-generator:4.0.1")
|
api("com.fasterxml.uuid:java-uuid-generator:4.0.1")
|
||||||
|
|
||||||
// https://github.com/MicroUtils/kotlin-logging
|
// https://github.com/MicroUtils/kotlin-logging
|
||||||
api("io.github.microutils:kotlin-logging:2.1.21")
|
api("io.github.microutils:kotlin-logging:2.1.23")
|
||||||
api("org.slf4j:slf4j-api:1.8.0-beta4")
|
api("org.slf4j:slf4j-api:1.8.0-beta4")
|
||||||
|
|
||||||
api("org.tukaani:xz:1.9")
|
api("org.tukaani:xz:1.9")
|
||||||
|
@ -37,7 +37,7 @@ class GtkLoader {
|
|||||||
*/
|
*/
|
||||||
public static
|
public static
|
||||||
String getVersion() {
|
String getVersion() {
|
||||||
return "1.27";
|
return "1.28";
|
||||||
}
|
}
|
||||||
|
|
||||||
// objdump -T /usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0 | grep gtk
|
// objdump -T /usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0 | grep gtk
|
||||||
|
@ -42,7 +42,7 @@ class Desktop {
|
|||||||
*/
|
*/
|
||||||
public static
|
public static
|
||||||
String getVersion() {
|
String getVersion() {
|
||||||
return "1.27";
|
return "1.28";
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
@ -56,7 +56,7 @@ object FileUtil {
|
|||||||
/**
|
/**
|
||||||
* Gets the version number.
|
* Gets the version number.
|
||||||
*/
|
*/
|
||||||
val version = "1.27"
|
val version = "1.28"
|
||||||
|
|
||||||
private val log = KotlinLogging.logger(FileUtil::class.java.name)
|
private val log = KotlinLogging.logger(FileUtil::class.java.name)
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
package dorkbox.util
|
package dorkbox.util
|
||||||
|
|
||||||
|
|
||||||
|
import dorkbox.netUtil.Dns
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import java.io.InputStream
|
import java.io.InputStream
|
||||||
@ -424,7 +425,7 @@ object WebUtil {
|
|||||||
|
|
||||||
substring = substring.substring(nextDot + 1)
|
substring = substring.substring(nextDot + 1)
|
||||||
|
|
||||||
if (DomainUtils.isTLD(substring)) {
|
if (Dns.isTLD(substring)) {
|
||||||
substring = last
|
substring = last
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -465,15 +466,15 @@ object WebUtil {
|
|||||||
if (end == -1) {
|
if (end == -1) {
|
||||||
if (start == 0) {
|
if (start == 0) {
|
||||||
// it was already clean.
|
// it was already clean.
|
||||||
return DomainUtils.extractSLD(fullDomainName)
|
return Dns.extractSLD(fullDomainName)
|
||||||
}
|
}
|
||||||
|
|
||||||
end = fullDomainName.length
|
end = fullDomainName.length
|
||||||
}
|
}
|
||||||
|
|
||||||
// for now, get the SLD as well
|
// for now, get the SLD as well
|
||||||
val substring= fullDomainName.substring(start, end)
|
val substring = fullDomainName.substring(start, end)
|
||||||
return DomainUtils.extractSLD(substring)
|
return Dns.extractSLD(substring)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -139,9 +139,9 @@ object OpenSSLDecryptor {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
// openssl enc -aes-256-cbc -d -md sha256 -in netref_install_2019.1.bin.enc -out netref_install_2019.1.bin.new -pass pass:xyfjWNl6yPIZfRYLu64L2sleiF8vD5xgHsJ3sa3Ya6sY01
|
// openssl enc -aes-256-cbc -d -md sha256 -in install_2019.1.bin.enc -out install_2019.1.bin.new -pass pass:xyfjWNl6yPIZfRYLu64L2sleiF8vD5xgHsJ3sa3Ya6sY01
|
||||||
// val plaintextFileName = "build/netref_install_2019.1.bin"
|
// val plaintextFileName = "build/install_2019.1.bin"
|
||||||
// val encryptedFileName = "build/netref_install_2019.1.bin.enc"
|
// val encryptedFileName = "build/install_2019.1.bin.enc"
|
||||||
// val fileOutputStream = FileOutputStream(File(encryptedFileName))
|
// val fileOutputStream = FileOutputStream(File(encryptedFileName))
|
||||||
// OpenSSLPBEOutputStream(fileOutputStream, password).use { outputStream ->
|
// OpenSSLPBEOutputStream(fileOutputStream, password).use { outputStream ->
|
||||||
// Files.copy(Path.of(plaintextFileName), outputStream)
|
// Files.copy(Path.of(plaintextFileName), outputStream)
|
||||||
@ -152,8 +152,8 @@ object OpenSSLDecryptor {
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
val plaintextFileName = "NetRefCommon/password.txt"
|
val plaintextFileName = "password.txt"
|
||||||
val encryptedFileName = "NetRefCommon/password.txt.enc"
|
val encryptedFileName = "password.txt.enc"
|
||||||
if (decrypt) {
|
if (decrypt) {
|
||||||
// --- read base 64 encoded file ---
|
// --- read base 64 encoded file ---
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user