Perform reorg to org.wpilib

README.md

@@ -6,7 +6,7 @@ gradle-jni is a utility library for enabling easy to build JNI compatible plugin
 
 ```gradle
 plugins {
-  id 'edu.wpi.first.GradleJni' version '0.1.6'
+  id 'org.wpilib.GradleJni' version '2027.0.0'
 }
 
 model {
@@ -27,6 +27,6 @@ JNICrossCompileOptions('toolChainName') // Use this to match the cross compile o
 JNICrossCompileOptions('operatingSystem', 'architecture') // Use this to match the cross compile options to a specific tool chain arch and os.
 
 // For both of these options, they take an optional last parameter of List<String> of directories
-If this parameter is added, the directories passed in will be used for the include paths for the JNI headers. 
+If this parameter is added, the directories passed in will be used for the include paths for the JNI headers.
 If this parameter is not passed in, for any matching toolchain, a set of headers included in the plugin will be used. These headers are standard for 32 bit embedded arm toolchains.
 ```

build.gradle

@@ -4,8 +4,8 @@ plugins {
     id "com.gradle.plugin-publish" version "1.3.0"
 }
 
-group = 'edu.wpi.first'
-version = '1.2.0'
+group = 'org.wpilib'
+version = '2027.0.0'
 
 if (project.hasProperty('publishVersion')) {
     version = project.publishVersion
@@ -21,15 +21,15 @@ gradlePlugin {
     vcsUrl = 'https://github.com/wpilibsuite/gradle-jni'
     plugins {
         GradleJni {
-            id = 'edu.wpi.first.GradleJni'
+            id = 'org.wpilib.GradleJni'
             displayName = 'Gradle JNI'
-            implementationClass = 'edu.wpi.first.jni.GradleJni'
+            implementationClass = 'org.wpilib.jni.GradleJni'
             description = 'This plugin provides easy to use JNI support for gradle.'
             tags = ['groovy', 'jni', 'utils', 'maven', 'frc', 'wpilib']
         }
     }
 }
 
 wrapper {
-    gradleVersion = '8.11'
+    gradleVersion = '9.2.0'
 }

example/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'cpp'
-    id 'edu.wpi.first.GradleJni' version '1.0.0'
+    id 'org.wpilib.GradleJni' version '2027.0.0'
 }
 
 model {

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -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.bat

@@ -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

src/main/java/edu/wpi/first/jni/CreateJniCrossCompileOptions.java → src/main/java/org/wpilib/jni/CreateJniCrossCompileOptions.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import java.util.List;
 

src/main/java/edu/wpi/first/jni/DefaultJniNativeExecutable.java → src/main/java/org/wpilib/jni/DefaultJniNativeExecutable.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.api.file.DirectoryProperty;

src/main/java/edu/wpi/first/jni/DefaultJniNativeLibrary.java → src/main/java/org/wpilib/jni/DefaultJniNativeLibrary.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.api.file.DirectoryProperty;

src/main/java/edu/wpi/first/jni/ExtractJniFilesTask.java → src/main/java/org/wpilib/jni/ExtractJniFilesTask.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import java.io.File;
 import java.io.FileOutputStream;

src/main/java/edu/wpi/first/jni/GradleJni.java → src/main/java/org/wpilib/jni/GradleJni.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;

src/main/java/edu/wpi/first/jni/GradleJniConfiguration.java → src/main/java/org/wpilib/jni/GradleJniConfiguration.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/edu/wpi/first/jni/JniCrossCompileOptions.java → src/main/java/org/wpilib/jni/JniCrossCompileOptions.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import java.util.List;
 

src/main/java/edu/wpi/first/jni/JniExtractedDependencySet.java → src/main/java/org/wpilib/jni/JniExtractedDependencySet.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import java.io.File;
 

src/main/java/edu/wpi/first/jni/JniNativeBaseSpec.java → src/main/java/org/wpilib/jni/JniNativeBaseSpec.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.api.file.DirectoryProperty;

src/main/java/edu/wpi/first/jni/JniNativeExecutableSpec.java → src/main/java/org/wpilib/jni/JniNativeExecutableSpec.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import org.gradle.nativeplatform.NativeExecutableSpec;
 

src/main/java/edu/wpi/first/jni/JniNativeLibrarySpec.java → src/main/java/org/wpilib/jni/JniNativeLibrarySpec.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import org.gradle.nativeplatform.NativeLibrarySpec;
 

src/main/java/edu/wpi/first/jni/JniNativeSpecInternal.java → src/main/java/org/wpilib/jni/JniNativeSpecInternal.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.api.file.DirectoryProperty;

src/main/java/edu/wpi/first/jni/JniRules.java → src/main/java/org/wpilib/jni/JniRules.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/edu/wpi/first/jni/JniSourceDependencySet.java → src/main/java/org/wpilib/jni/JniSourceDependencySet.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import org.gradle.api.Project;
 import org.gradle.api.file.DirectoryProperty;

src/main/java/edu/wpi/first/jni/JniSymbolCheck.java → src/main/java/org/wpilib/jni/JniSymbolCheck.java

@@ -1,8 +1,8 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
-import static edu.wpi.first.jni.net.fornwall.jelf.ElfSection.SHT_DYNSYM;
-import static edu.wpi.first.jni.net.fornwall.jelf.ElfSymbol.BINDING_GLOBAL;
-import static edu.wpi.first.jni.net.fornwall.jelf.ElfSymbol.STT_FUNC;
+import static org.wpilib.jni.net.fornwall.jelf.ElfSection.SHT_DYNSYM;
+import static org.wpilib.jni.net.fornwall.jelf.ElfSymbol.BINDING_GLOBAL;
+import static org.wpilib.jni.net.fornwall.jelf.ElfSymbol.STT_FUNC;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -35,11 +35,10 @@
 import org.gradle.nativeplatform.toolchain.internal.msvcpp.VisualStudioInstall;
 import org.gradle.platform.base.internal.toolchain.SearchResult;
 import org.gradle.process.ExecOperations;
-
-import edu.wpi.first.jni.net.fornwall.jelf.ElfException;
-import edu.wpi.first.jni.net.fornwall.jelf.ElfFile;
-import edu.wpi.first.jni.net.fornwall.jelf.ElfSection;
-import edu.wpi.first.jni.net.fornwall.jelf.ElfSymbol;
+import org.wpilib.jni.net.fornwall.jelf.ElfException;
+import org.wpilib.jni.net.fornwall.jelf.ElfFile;
+import org.wpilib.jni.net.fornwall.jelf.ElfSection;
+import org.wpilib.jni.net.fornwall.jelf.ElfSymbol;
 
 public class JniSymbolCheck extends DefaultTask {
   private final RegularFileProperty foundSymbols;

src/main/java/edu/wpi/first/jni/JniSystemDependencySet.java → src/main/java/org/wpilib/jni/JniSystemDependencySet.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni;
+package org.wpilib.jni;
 
 import org.gradle.api.Project;
 import org.gradle.api.file.FileCollection;

src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfDynamicStructure.java → src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfDynamicStructure.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni.net.fornwall.jelf;
+package org.wpilib.jni.net.fornwall.jelf;
 
 import java.io.IOException;
 import java.util.ArrayList;

src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfException.java → src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfException.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni.net.fornwall.jelf;
+package org.wpilib.jni.net.fornwall.jelf;
 
 /**
  * Generic exception class for all exceptions which occur in this package. Since

src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfFile.java → src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfFile.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni.net.fornwall.jelf;
+package org.wpilib.jni.net.fornwall.jelf;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfHashTable.java → src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfHashTable.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni.net.fornwall.jelf;
+package org.wpilib.jni.net.fornwall.jelf;
 
 
 public class ElfHashTable {

src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfNote.java → src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfNote.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni.net.fornwall.jelf;
+package org.wpilib.jni.net.fornwall.jelf;
 
 import java.io.IOException;
 

src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfParser.java → src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfParser.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni.net.fornwall.jelf;
+package org.wpilib.jni.net.fornwall.jelf;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSection.java → src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfSection.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni.net.fornwall.jelf;
+package org.wpilib.jni.net.fornwall.jelf;
 
 import java.io.IOException;
 

src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSegment.java → src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfSegment.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni.net.fornwall.jelf;
+package org.wpilib.jni.net.fornwall.jelf;
 
 import java.io.IOException;
 

src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfStringTable.java → src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfStringTable.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni.net.fornwall.jelf;
+package org.wpilib.jni.net.fornwall.jelf;
 
 import java.io.IOException;
 

src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSymbol.java → src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfSymbol.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni.net.fornwall.jelf;
+package org.wpilib.jni.net.fornwall.jelf;
 
 import java.io.IOException;
 

src/main/java/edu/wpi/first/jni/net/fornwall/jelf/MemoizedObject.java → src/main/java/org/wpilib/jni/net/fornwall/jelf/MemoizedObject.java

@@ -1,4 +1,4 @@
-package edu.wpi.first.jni.net.fornwall.jelf;
+package org.wpilib.jni.net.fornwall.jelf;
 
 import java.io.IOException;