Skip to content

Commit 02899b8

Browse files
authored
Merge pull request #259 from ThadHouse/repackage
Repackage plugin to new native marker
2 parents d988593 + e36c2ef commit 02899b8

File tree

91 files changed

+228
-225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+228
-225
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,10 @@ To use a custom build of native-utils in a robot project, the build must be publ
217217
1. Update the version in `build.gradle` so that native-utils won't overwrite an existing version.
218218
```
219219
allprojects {
220-
group = "edu.wpi.first"
220+
group = "org.wpilib"
221221
version = "2024.3.1"
222+
}
222223
```
223224
2. Execute `.\gradlew publishToMavenLocal`
224-
3. Update native-utils version in GradleRIO ``build.gradle``: ``api 'edu.wpi.first:native-utils:2024.3.1'``
225+
3. Update native-utils version in GradleRIO ``build.gradle``: ``api 'org.wpilib:native-utils:2024.3.1'``
225226
4. Follow the directions in the ![GradleRIO readme](https://github.com/wpilibsuite/GradleRIO/#using-gradlerio-custom-builds) for publishing a local build and using in a robot program

ToolchainPlugin/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ gradlePlugin {
5252
vcsUrl = 'https://github.com/wpilibsuite/native-utils'
5353
plugins {
5454
toolchain {
55-
id = 'edu.wpi.first.Toolchain'
55+
id = 'org.wpilib.Toolchain'
5656
displayName = 'Toolchain'
57-
implementationClass = 'edu.wpi.first.toolchain.ToolchainPlugin'
57+
implementationClass = 'org.wpilib.toolchain.ToolchainPlugin'
5858
description = 'FRC Toolchain Standalone Gradle Plugin'
5959
tags = ['frc', 'wpilib', 'gradlerio']
6060
}

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/AbstractToolchainInstaller.java renamed to ToolchainPlugin/src/main/java/org/wpilib/toolchain/AbstractToolchainInstaller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.wpi.first.toolchain;
1+
package org.wpilib.toolchain;
22

33
import org.gradle.api.Project;
44
import org.gradle.internal.os.OperatingSystem;

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/DefaultToolchainInstaller.java renamed to ToolchainPlugin/src/main/java/org/wpilib/toolchain/DefaultToolchainInstaller.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.wpi.first.toolchain;
1+
package org.wpilib.toolchain;
22

33
import de.undercouch.gradle.tasks.download.DownloadAction;
44
import org.gradle.api.GradleException;

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/FrcHome.java renamed to ToolchainPlugin/src/main/java/org/wpilib/toolchain/FrcHome.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.wpi.first.toolchain;
1+
package org.wpilib.toolchain;
22

33
import org.gradle.internal.os.OperatingSystem;
44

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/GccExtension.java renamed to ToolchainPlugin/src/main/java/org/wpilib/toolchain/GccExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.wpi.first.toolchain;
1+
package org.wpilib.toolchain;
22

33
import org.gradle.api.Project;
44
import org.gradle.nativeplatform.toolchain.Gcc;

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/InstallToolchainTask.java renamed to ToolchainPlugin/src/main/java/org/wpilib/toolchain/InstallToolchainTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.wpi.first.toolchain;
1+
package org.wpilib.toolchain;
22

33
import org.gradle.api.DefaultTask;
44
import org.gradle.api.GradleException;

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/NativePlatforms.java renamed to ToolchainPlugin/src/main/java/org/wpilib/toolchain/NativePlatforms.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.wpi.first.toolchain;
1+
package org.wpilib.toolchain;
22

33
import java.io.ByteArrayOutputStream;
44

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/OrderedStripTask.java renamed to ToolchainPlugin/src/main/java/org/wpilib/toolchain/OrderedStripTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.wpi.first.toolchain;
1+
package org.wpilib.toolchain;
22

33
import java.io.File;
44
import java.util.List;

ToolchainPlugin/src/main/java/edu/wpi/first/toolchain/ToolchainDescriptor.java renamed to ToolchainPlugin/src/main/java/org/wpilib/toolchain/ToolchainDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.wpi.first.toolchain;
1+
package org.wpilib.toolchain;
22

33
import java.util.ArrayList;
44
import java.util.List;

0 commit comments

Comments
 (0)