Perform reorg to org.wpilib (#40)

* Perform reorg to org.wpilib

* Fix tests

Author: ThadHouse

.github/workflows/main.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Check output
       run: git --no-pager diff --exit-code HEAD
     - name: Build Test
-      run: ./gradlew build
+      run: ../../gradlew build
       working-directory: testing/cpp
 
   publish:

README.md

@@ -5,7 +5,7 @@ Deploy to Embedded Targets in both Java and C++.
 For all projects, you can define deployment targets and artifacts. The deploy process works over SSH/SFTP and
 is extremely quick.
 
-For the previous functionality for native library building, see edu.wpi.first.NativeUtils
+For the previous functionality for native library building, see org.wpilib.NativeUtils
 
 Commands:
 `gradlew deploy` will deploy all artifacts
@@ -20,11 +20,11 @@ Properties:
 Include the following in your `build.gradle`
 ```gradle
 plugins {
-    id "edu.wpi.first.DeployUtils" version "<latest version>"
+    id "org.wpilib.DeployUtils" version "<latest version>"
 }
 ```
 
-See [https://plugins.gradle.org/plugin/edu.wpi.first.DeployUtils](https://plugins.gradle.org/plugin/edu.first.wpi.DeployUtils) for the latest version
+See [https://plugins.gradle.org/plugin/org.wpilib.DeployUtils](https://plugins.gradle.org/plugin/org.wpilib.DeployUtils) for the latest version
 
 ## Spec
 

build.gradle

@@ -8,27 +8,25 @@ plugins {
 
 repositories {
     maven {
-        url "https://plugins.gradle.org/m2/"
+        url = "https://plugins.gradle.org/m2/"
     }
     mavenLocal()
     mavenCentral()
 }
 
 dependencies {
-    api 'com.jcraft:jsch:0.1.55'
     api 'com.google.code.gson:gson:2.8.6'
 
     api 'org.apache.sshd:sshd-core:2.13.2'
     api 'org.apache.sshd:sshd-sftp:2.13.2'
     implementation 'net.i2p.crypto:eddsa:0.3.0'
 
-    testImplementation('org.spockframework:spock-core:2.0-M4-groovy-3.0') {
+    testImplementation('org.spockframework:spock-core:2.4-M6-groovy-4.0') {
         exclude group: 'org.codehaus.groovy'
     }
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-    testImplementation('cglib:cglib-nodep:2.2')
-    testImplementation('org.objenesis:objenesis:1.2')
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation gradleTestKit()
 }
 
@@ -41,8 +39,8 @@ buildScan {
     termsOfServiceAgree = 'yes'
 }
 
-group = "edu.wpi.first"
-version = "2025.2.2"
+group = "org.wpilib"
+version = "2027.0.0"
 
 base {
     archivesName = "DeployUtils"
@@ -58,9 +56,9 @@ gradlePlugin {
     vcsUrl = 'https://github.com/wpilibsuite/deploy-utils'
     plugins {
         DeployUtils {
-            id = 'edu.wpi.first.DeployUtils'
+            id = 'org.wpilib.DeployUtils'
             displayName = 'DeployUtils'
-            implementationClass = 'edu.wpi.first.deployutils.DeployUtils'
+            implementationClass = 'org.wpilib.deployutils.DeployUtils'
             description = 'Additions to the model-based DSL for deploying Java and Native projects to remote targets'
             tags = ['remote', 'target', 'deploy', 'java', 'native']
         }
@@ -80,14 +78,14 @@ def examplesFolder = file("$rootDir/testing")
 
 tasks.register('PatchExamples') {
     doLast {
-        String regex = "(id\\s*?[\\\"|\\']edu\\.wpi\\.first\\.DeployUtils[\\\"|\\'].*?version\\s*?[\\\"|\\'])(.+?)([\\\"|\\'])";
+        String regex = "(id\\s*?[\\\"|\\']org\\.wpilib\\.DeployUtils[\\\"|\\'].*?version\\s*?[\\\"|\\'])(.+?)([\\\"|\\'])";
 
         examplesFolder.eachFile { File file ->
             if (file.isDirectory() && file.name != '_archived') {
                 def buildGradleFile = new File(file, 'build.gradle')
                 if (buildGradleFile.exists() && buildGradleFile.isFile()) {
                     def text = buildGradleFile.text
-                    text = text.replaceAll(regex, "id \"edu.wpi.first.DeployUtils\" version \"${version}\"")
+                    text = text.replaceAll(regex, "id \"org.wpilib.DeployUtils\" version \"${version}\"")
                     buildGradleFile.text = text
                 }
             }
@@ -99,6 +97,6 @@ build.dependsOn PatchExamples
 jar.finalizedBy PatchExamples
 
 wrapper {
-    gradleVersion = '8.10.2'
+    gradleVersion = '9.2.0'
     distributionType = Wrapper.DistributionType.BIN
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -173,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -206,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell