Update to gradle 8.1, enable windows arm64 builds (#16)

Author: ThadHouse

.github/workflows/ci.yml

@@ -82,6 +82,10 @@ jobs:
           - artifact-name: Win32
             architecture: x86
             vc: vcvars32.bat
+          - artifact-name: WinArm64
+            architecture: x64
+            vc: vcvarsamd64_arm64.bat
+            build-options: "-Pforcecrossbuild=windows-arm64"
     name: "Build - ${{ matrix.artifact-name }}"
     runs-on: windows-2019
     steps:
@@ -99,7 +103,7 @@ jobs:
       - name: Build with Gradle
         run: |
           @call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\${{ matrix.vc }}"
-          gradlew build
+          gradlew build ${{ matrix.build-options }}
         shell: cmd
 
       - uses: actions/upload-artifact@v2

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 // Project Version
-ext.pub_version = "0.95-6"
+ext.pub_version = "0.95-7"
 
 static def get_platform() {
   def platform
@@ -29,6 +29,7 @@ static def get_platform() {
   } else {
     platform = "${os_name}-${os_arch}"
   }
+
   return platform
 }
 
@@ -49,6 +50,8 @@ static def get_platform_path(platform) {
     return "windows/x86"
   } else if (platform == "windows-x86_64") {
     return "windows/x86-64"
+  } else if (platform == "windows-arm64") {
+    return "windows/arm64"
   } else {
     return ""
   }
@@ -101,8 +104,8 @@ task copyAllOutputs(type: Copy) {
 
 ext.addTaskToCopyAllOutputs = { task ->
   copyAllOutputs.dependsOn task
-  copyAllOutputs.inputs.file task.archivePath
-  copyAllOutputs.from task.archivePath
+  copyAllOutputs.inputs.file task.archiveFile
+  copyAllOutputs.from task.archiveFile
 }
 
 task build {
@@ -112,5 +115,5 @@ task build {
 apply from: "publish.gradle"
 
 wrapper {
-    gradleVersion = '7.5.1'
+    gradleVersion = '8.1'
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -50,10 +50,17 @@ types.each { type ->
     workingDir build_dir
     environment "OPENSSL_ROOT_DIR": "${project.openssl_install}"
 
+    def platformArg = "x64"
+    if (project.platform == "windows-x86") {
+      platformArg = "Win32"
+    } else if (project.platform == "windows-arm64") {
+      platformArg = "arm64"
+    }
+
     // Add the arch specifier for Windows.
     if (project.platform.contains("windows")) {
       args "-A"
-      args project.platform == "windows-x86" ? "Win32" : "x64"
+      args platformArg
     }
 
     dependsOn prepareLibSshirectories
@@ -74,10 +81,16 @@ types.each { type ->
     args "--build", ".", "--parallel", "${project.processors}"
     workingDir build_dir
 
+    def platformArg = "/p:Platform=x64"
+    if (project.platform == "windows-x86") {
+      platformArg = "/p:Platform=win32"
+    } else if (project.platform == "windows-arm64") {
+      platformArg = "/p:Platform=arm64"
+    }
+
     // Specify arch and build type on Windows.
     if (project.platform.contains("windows")) {
-      args "--", "/p:Configuration=$type", "/v:m",
-          project.platform == "windows-x86" ? "/p:Platform=win32" : "/p:Platform=x64"
+      args "--", "/p:Configuration=$type", "/v:m", platformArg
     }
   }
 }

gradlew

@@ -17,7 +17,13 @@ project.tasks.create("configureOpenSSL", Exec) {
 
   // Add the arch specifier for Windows.
   if (project.platform.contains("windows")) {
-    args project.platform == "windows-x86" ? "VC-WIN32" : "VC-WIN64A"
+    if (project.platform == "windows-x86") {
+      args "VC-WIN32"
+    } else if (project.platform == "windows-arm64") {
+      args "VC-WIN64-ARM"
+    } else {
+      args "VC-WIN64A"
+    }
   } else if (project.platform == "osx-arm64") {
     args "darwin64-arm64-cc"
     environment "ARCHFLAGS", "-arch arm64"

gradlew.bat

@@ -36,7 +36,7 @@ task cppHeadersZip(type: Zip) {
 
   destinationDirectory = outputs_dir
   archiveBaseName = zip_base_name
-  classifier = "headers"
+  archiveClassifier = "headers"
 
   // Copy license files.
   from(libssh_license_file) {
@@ -72,7 +72,7 @@ task cppSourcesZip(type: Zip) {
 
   destinationDirectory = outputs_dir
   archiveBaseName = zip_base_name
-  classifier = "sources"
+  archiveClassifier = "sources"
 
   // Copy license files.
   from(libssh_license_file) {
@@ -104,7 +104,7 @@ types.each { type ->
 
     destinationDirectory = outputs_dir
     archiveBaseName = zip_base_name
-    classifier = project.platform_classifier + "static" + type.toLowerCase().replace("release", "")
+    archiveClassifier = project.platform_classifier + "static" + type.toLowerCase().replace("release", "")
 
     // Copy license files.
     from(libssh_license_file) {