Merge pull request #601 from hexagonkt/develop

Small fixes
hexagontk · Jan 19, 2023 · 463c76e · 463c76e
2 parents d76eac4 + 5655397
commit 463c76e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/core/src/main/kotlin/com/hexagonkt/core/Network.kt b/core/src/main/kotlin/com/hexagonkt/core/Network.kt
@@ -70,11 +70,11 @@ fun URL.exists(): Boolean =
     }
 
 fun URL.firstVariant(vararg suffixes: String): URL {
-    val extension = file.substringAfter('.').println()
-    val fileName = file.removeSuffix(".$extension").println()
+    val extension = file.substringAfter('.')
+    val fileName = file.removeSuffix(".$extension")
 
     suffixes.forEach {
-        val u = URL("$protocol:$fileName$it.$extension".println())
+        val u = URL("$protocol:$fileName$it.$extension")
         if (u.exists())
             return u
     }

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.warning.mode=all
 org.gradle.console=plain
 
 # Gradle
-version=2.4.4
+version=2.4.5
 group=com.hexagonkt
 description=The atoms of your platform
 

diff --git a/gradle/native.gradle b/gradle/native.gradle
@@ -32,7 +32,9 @@ tasks.register("upx", Exec) {
 
     final String source = "$buildDir/native/nativeCompile/${project.name}"
     final String target = "$buildDir/native/${project.name}"
-    final String command = "upx $source -o $target"
+    final String os = System.getProperty("os.name").toLowerCase()
+    final String command =
+        os.contains("windows")? "upx ${source}.exe -o ${target}.exe" : "upx $source -o $target"
     commandLine(command.split(" "))
 
     doFirst {
@@ -47,8 +49,9 @@ tasks.register("zipNative", Zip) {
 
     final String os = System.getProperty("os.name").toLowerCase()
     final String arch = System.getProperty("os.arch").toLowerCase()
+    final String source = os.contains("windows")? "${project.name}.exe" : project.name
     from("$buildDir/native")
-    include(project.name)
+    include(source)
     archiveFileName.set("${project.name}-${project.version}-${os}-${arch}.zip")
     destinationDirectory.set(buildDir.toPath().resolve("distributions").toFile())
 }