diff --git a/README.md b/README.md index 3f4fec4..c0bc1ca 100644 --- a/README.md +++ b/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 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. ``` diff --git a/build.gradle b/build.gradle index 2265217..de6a221 100644 --- a/build.gradle +++ b/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,9 +21,9 @@ 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'] } @@ -31,5 +31,5 @@ gradlePlugin { } wrapper { - gradleVersion = '8.11' + gradleVersion = '9.2.0' } diff --git a/example/build.gradle b/example/build.gradle index 204a1df..8b76477 100644 --- a/example/build.gradle +++ b/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 { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..f8e1ee3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94113f2..bad7c24 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradlew b/gradlew index f5feea6..adff685 100755 --- a/gradlew +++ b/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. diff --git a/gradlew.bat b/gradlew.bat index 9b42019..e509b2d 100644 --- a/gradlew.bat +++ b/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 diff --git a/src/main/java/edu/wpi/first/jni/CreateJniCrossCompileOptions.java b/src/main/java/org/wpilib/jni/CreateJniCrossCompileOptions.java similarity index 96% rename from src/main/java/edu/wpi/first/jni/CreateJniCrossCompileOptions.java rename to src/main/java/org/wpilib/jni/CreateJniCrossCompileOptions.java index 8422412..09515a2 100644 --- a/src/main/java/edu/wpi/first/jni/CreateJniCrossCompileOptions.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/DefaultJniNativeExecutable.java b/src/main/java/org/wpilib/jni/DefaultJniNativeExecutable.java similarity index 94% rename from src/main/java/edu/wpi/first/jni/DefaultJniNativeExecutable.java rename to src/main/java/org/wpilib/jni/DefaultJniNativeExecutable.java index 502f1f0..1e8f30c 100644 --- a/src/main/java/edu/wpi/first/jni/DefaultJniNativeExecutable.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/DefaultJniNativeLibrary.java b/src/main/java/org/wpilib/jni/DefaultJniNativeLibrary.java similarity index 94% rename from src/main/java/edu/wpi/first/jni/DefaultJniNativeLibrary.java rename to src/main/java/org/wpilib/jni/DefaultJniNativeLibrary.java index fc6b1fc..41af936 100644 --- a/src/main/java/edu/wpi/first/jni/DefaultJniNativeLibrary.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/ExtractJniFilesTask.java b/src/main/java/org/wpilib/jni/ExtractJniFilesTask.java similarity index 98% rename from src/main/java/edu/wpi/first/jni/ExtractJniFilesTask.java rename to src/main/java/org/wpilib/jni/ExtractJniFilesTask.java index 9332cfd..da1e856 100644 --- a/src/main/java/edu/wpi/first/jni/ExtractJniFilesTask.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/GradleJni.java b/src/main/java/org/wpilib/jni/GradleJni.java similarity index 97% rename from src/main/java/edu/wpi/first/jni/GradleJni.java rename to src/main/java/org/wpilib/jni/GradleJni.java index 91c73fe..a964c59 100644 --- a/src/main/java/edu/wpi/first/jni/GradleJni.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/GradleJniConfiguration.java b/src/main/java/org/wpilib/jni/GradleJniConfiguration.java similarity index 94% rename from src/main/java/edu/wpi/first/jni/GradleJniConfiguration.java rename to src/main/java/org/wpilib/jni/GradleJniConfiguration.java index e3a8236..d519990 100644 --- a/src/main/java/edu/wpi/first/jni/GradleJniConfiguration.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/JniCrossCompileOptions.java b/src/main/java/org/wpilib/jni/JniCrossCompileOptions.java similarity index 91% rename from src/main/java/edu/wpi/first/jni/JniCrossCompileOptions.java rename to src/main/java/org/wpilib/jni/JniCrossCompileOptions.java index e1397b0..b8bf3c2 100644 --- a/src/main/java/edu/wpi/first/jni/JniCrossCompileOptions.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/JniExtractedDependencySet.java b/src/main/java/org/wpilib/jni/JniExtractedDependencySet.java similarity index 97% rename from src/main/java/edu/wpi/first/jni/JniExtractedDependencySet.java rename to src/main/java/org/wpilib/jni/JniExtractedDependencySet.java index 0a272e8..171a2dd 100644 --- a/src/main/java/edu/wpi/first/jni/JniExtractedDependencySet.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/JniNativeBaseSpec.java b/src/main/java/org/wpilib/jni/JniNativeBaseSpec.java similarity index 93% rename from src/main/java/edu/wpi/first/jni/JniNativeBaseSpec.java rename to src/main/java/org/wpilib/jni/JniNativeBaseSpec.java index b293907..e97bc98 100644 --- a/src/main/java/edu/wpi/first/jni/JniNativeBaseSpec.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/JniNativeExecutableSpec.java b/src/main/java/org/wpilib/jni/JniNativeExecutableSpec.java similarity index 81% rename from src/main/java/edu/wpi/first/jni/JniNativeExecutableSpec.java rename to src/main/java/org/wpilib/jni/JniNativeExecutableSpec.java index d4f2ad7..7a5528e 100644 --- a/src/main/java/edu/wpi/first/jni/JniNativeExecutableSpec.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/JniNativeLibrarySpec.java b/src/main/java/org/wpilib/jni/JniNativeLibrarySpec.java similarity index 81% rename from src/main/java/edu/wpi/first/jni/JniNativeLibrarySpec.java rename to src/main/java/org/wpilib/jni/JniNativeLibrarySpec.java index eb01a2b..9430cd4 100644 --- a/src/main/java/edu/wpi/first/jni/JniNativeLibrarySpec.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/JniNativeSpecInternal.java b/src/main/java/org/wpilib/jni/JniNativeSpecInternal.java similarity index 86% rename from src/main/java/edu/wpi/first/jni/JniNativeSpecInternal.java rename to src/main/java/org/wpilib/jni/JniNativeSpecInternal.java index 541d37b..0eec91c 100644 --- a/src/main/java/edu/wpi/first/jni/JniNativeSpecInternal.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/JniRules.java b/src/main/java/org/wpilib/jni/JniRules.java similarity index 99% rename from src/main/java/edu/wpi/first/jni/JniRules.java rename to src/main/java/org/wpilib/jni/JniRules.java index 1d4f1ca..90c0e7f 100644 --- a/src/main/java/edu/wpi/first/jni/JniRules.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/JniSourceDependencySet.java b/src/main/java/org/wpilib/jni/JniSourceDependencySet.java similarity index 93% rename from src/main/java/edu/wpi/first/jni/JniSourceDependencySet.java rename to src/main/java/org/wpilib/jni/JniSourceDependencySet.java index 62c1e51..bc8e70f 100644 --- a/src/main/java/edu/wpi/first/jni/JniSourceDependencySet.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/JniSymbolCheck.java b/src/main/java/org/wpilib/jni/JniSymbolCheck.java similarity index 95% rename from src/main/java/edu/wpi/first/jni/JniSymbolCheck.java rename to src/main/java/org/wpilib/jni/JniSymbolCheck.java index edefdb1..2d90179 100644 --- a/src/main/java/edu/wpi/first/jni/JniSymbolCheck.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/JniSystemDependencySet.java b/src/main/java/org/wpilib/jni/JniSystemDependencySet.java similarity index 92% rename from src/main/java/edu/wpi/first/jni/JniSystemDependencySet.java rename to src/main/java/org/wpilib/jni/JniSystemDependencySet.java index 2cf1757..ecdd2c7 100644 --- a/src/main/java/edu/wpi/first/jni/JniSystemDependencySet.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfDynamicStructure.java b/src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfDynamicStructure.java similarity index 99% rename from src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfDynamicStructure.java rename to src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfDynamicStructure.java index 8f001b3..d717363 100644 --- a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfDynamicStructure.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfException.java b/src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfException.java similarity index 92% rename from src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfException.java rename to src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfException.java index fff9b03..f174888 100644 --- a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfException.java +++ b/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 diff --git a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfFile.java b/src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfFile.java similarity index 99% rename from src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfFile.java rename to src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfFile.java index ed1e05b..29becb6 100644 --- a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfFile.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfHashTable.java b/src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfHashTable.java similarity index 97% rename from src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfHashTable.java rename to src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfHashTable.java index 156c394..96801a6 100644 --- a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfHashTable.java +++ b/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 { diff --git a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfNote.java b/src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfNote.java similarity index 97% rename from src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfNote.java rename to src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfNote.java index eb5246b..0dc0e1e 100644 --- a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfNote.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfParser.java b/src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfParser.java similarity index 99% rename from src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfParser.java rename to src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfParser.java index 0553a20..1696a00 100644 --- a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfParser.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSection.java b/src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfSection.java similarity index 99% rename from src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSection.java rename to src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfSection.java index 8010265..c94925c 100644 --- a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSection.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSegment.java b/src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfSegment.java similarity index 99% rename from src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSegment.java rename to src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfSegment.java index 21e4148..1092afc 100644 --- a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSegment.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfStringTable.java b/src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfStringTable.java similarity index 95% rename from src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfStringTable.java rename to src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfStringTable.java index 1f8397e..728e627 100644 --- a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfStringTable.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSymbol.java b/src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfSymbol.java similarity index 99% rename from src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSymbol.java rename to src/main/java/org/wpilib/jni/net/fornwall/jelf/ElfSymbol.java index 1d16868..2ebbf8e 100644 --- a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/ElfSymbol.java +++ b/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; diff --git a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/MemoizedObject.java b/src/main/java/org/wpilib/jni/net/fornwall/jelf/MemoizedObject.java similarity index 94% rename from src/main/java/edu/wpi/first/jni/net/fornwall/jelf/MemoizedObject.java rename to src/main/java/org/wpilib/jni/net/fornwall/jelf/MemoizedObject.java index ca893ee..6f4ce95 100644 --- a/src/main/java/edu/wpi/first/jni/net/fornwall/jelf/MemoizedObject.java +++ b/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;