generated from DeepBlueRobotics/EmptyProject2024
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #55 from DeepBlueRobotics/fix-line-endings
Normalize line endings and keep them normalized
- Loading branch information
Showing
6 changed files
with
272 additions
and
270 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Ensure end-of-line normalization for new files | ||
| * text=auto |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| Copyright (c) 2009-2023 FIRST and other WPILib contributors | ||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are met: | ||
| * Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
| * Redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in the | ||
| documentation and/or other materials provided with the distribution. | ||
| * Neither the name of FIRST, WPILib, nor the names of other WPILib | ||
| contributors may be used to endorse or promote products derived from | ||
| this software without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY FIRST AND OTHER WPILIB CONTRIBUTORS "AS IS" AND | ||
| ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT AND FITNESS FOR A PARTICULAR | ||
| PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR | ||
| ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| Copyright (c) 2009-2023 FIRST and other WPILib contributors | ||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are met: | ||
| * Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
| * Redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in the | ||
| documentation and/or other materials provided with the distribution. | ||
| * Neither the name of FIRST, WPILib, nor the names of other WPILib | ||
| contributors may be used to endorse or promote products derived from | ||
| this software without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY FIRST AND OTHER WPILIB CONTRIBUTORS "AS IS" AND | ||
| ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT AND FITNESS FOR A PARTICULAR | ||
| PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR | ||
| ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,112 +1,112 @@ | ||
| plugins { | ||
| id "java" | ||
| id "edu.wpi.first.GradleRIO" version "2024.3.2" | ||
| } | ||
|
|
||
| java { | ||
| sourceCompatibility = JavaVersion.VERSION_17 | ||
| targetCompatibility = JavaVersion.VERSION_17 | ||
| } | ||
|
|
||
| def ROBOT_MAIN_CLASS = "org.carlmontrobotics.Main" | ||
|
|
||
| // Define my targets (RoboRIO) and artifacts (deployable files) | ||
| // This is added by GradleRIO's backing project DeployUtils. | ||
| deploy { | ||
| targets { | ||
| roborio(getTargetTypeClass('RoboRIO')) { | ||
| // Team number is loaded either from the .wpilib/wpilib_preferences.json | ||
| // or from command line. If not found an exception will be thrown. | ||
| // You can use getTeamOrDefault(team) instead of getTeamNumber if you | ||
| // want to store a team number in this file. | ||
| team = project.frc.getTeamNumber() | ||
| debug = project.frc.getDebugOrDefault(false) | ||
|
|
||
| artifacts { | ||
| // First part is artifact name, 2nd is artifact type | ||
| // getTargetTypeClass is a shortcut to get the class type using a string | ||
|
|
||
| frcJava(getArtifactTypeClass('FRCJavaArtifact')) { | ||
| } | ||
|
|
||
| // Static files artifact | ||
| frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) { | ||
| files = project.fileTree('src/main/deploy') | ||
| directory = '/home/lvuser/deploy' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| def deployArtifact = deploy.targets.roborio.artifacts.frcJava | ||
|
|
||
| // Set to true to use debug for JNI. | ||
| wpi.java.debugJni = false | ||
|
|
||
| // Set this to true to enable desktop support. | ||
| def includeDesktopSupport = true | ||
|
|
||
| allprojects { | ||
| repositories { | ||
| maven { url 'https://jitpack.io' }//for lib199 | ||
| } | ||
| } | ||
|
|
||
| // Don't cache changing modules | ||
| configurations.all { | ||
| resolutionStrategy.cacheChangingModulesFor 0, 'seconds' | ||
| } | ||
|
|
||
| // Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries. | ||
| // Also defines JUnit 5. | ||
| dependencies { | ||
| implementation wpi.java.deps.wpilib() | ||
| implementation wpi.java.vendor.java() | ||
|
|
||
| roborioDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.roborio) | ||
| roborioDebug wpi.java.vendor.jniDebug(wpi.platforms.roborio) | ||
|
|
||
| roborioRelease wpi.java.deps.wpilibJniRelease(wpi.platforms.roborio) | ||
| roborioRelease wpi.java.vendor.jniRelease(wpi.platforms.roborio) | ||
|
|
||
| nativeDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.desktop) | ||
| nativeDebug wpi.java.vendor.jniDebug(wpi.platforms.desktop) | ||
| simulationDebug wpi.sim.enableDebug() | ||
|
|
||
| nativeRelease wpi.java.deps.wpilibJniRelease(wpi.platforms.desktop) | ||
| nativeRelease wpi.java.vendor.jniRelease(wpi.platforms.desktop) | ||
| simulationRelease wpi.sim.enableRelease() | ||
|
|
||
| testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1' | ||
| implementation "com.github.deepbluerobotics:lib199:0ce129844b9b918dad0207c0e1020fc26588f461" | ||
| } | ||
|
|
||
| test { | ||
| useJUnitPlatform() | ||
| systemProperty 'junit.jupiter.extensions.autodetection.enabled', 'true' | ||
| } | ||
|
|
||
| // Simulation configuration (e.g. environment variables). | ||
| wpi.sim.addGui().defaultEnabled = true | ||
| wpi.sim.addDriverstation() | ||
|
|
||
| // Setting up my Jar File. In this case, adding all libraries into the main jar ('fat jar') | ||
| // in order to make them all available at runtime. Also adding the manifest so WPILib | ||
| // knows where to look for our Robot Class. | ||
| jar { | ||
| from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } | ||
| from sourceSets.main.allSource | ||
| manifest edu.wpi.first.gradlerio.GradleRIOPlugin.javaManifest(ROBOT_MAIN_CLASS) | ||
| duplicatesStrategy = DuplicatesStrategy.INCLUDE | ||
| } | ||
|
|
||
| // Configure jar and deploy tasks | ||
| deployArtifact.jarTask = jar | ||
| wpi.java.configureExecutableTasks(jar) | ||
| wpi.java.configureTestTasks(test) | ||
|
|
||
| // Configure string concat to always inline compile | ||
| tasks.withType(JavaCompile) { | ||
| options.compilerArgs.add '-XDstringConcat=inline' | ||
| } | ||
| plugins { | ||
| id "java" | ||
| id "edu.wpi.first.GradleRIO" version "2024.3.2" | ||
| } | ||
|
|
||
| java { | ||
| sourceCompatibility = JavaVersion.VERSION_17 | ||
| targetCompatibility = JavaVersion.VERSION_17 | ||
| } | ||
|
|
||
| def ROBOT_MAIN_CLASS = "org.carlmontrobotics.Main" | ||
|
|
||
| // Define my targets (RoboRIO) and artifacts (deployable files) | ||
| // This is added by GradleRIO's backing project DeployUtils. | ||
| deploy { | ||
| targets { | ||
| roborio(getTargetTypeClass('RoboRIO')) { | ||
| // Team number is loaded either from the .wpilib/wpilib_preferences.json | ||
| // or from command line. If not found an exception will be thrown. | ||
| // You can use getTeamOrDefault(team) instead of getTeamNumber if you | ||
| // want to store a team number in this file. | ||
| team = project.frc.getTeamNumber() | ||
| debug = project.frc.getDebugOrDefault(false) | ||
|
|
||
| artifacts { | ||
| // First part is artifact name, 2nd is artifact type | ||
| // getTargetTypeClass is a shortcut to get the class type using a string | ||
|
|
||
| frcJava(getArtifactTypeClass('FRCJavaArtifact')) { | ||
| } | ||
|
|
||
| // Static files artifact | ||
| frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) { | ||
| files = project.fileTree('src/main/deploy') | ||
| directory = '/home/lvuser/deploy' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| def deployArtifact = deploy.targets.roborio.artifacts.frcJava | ||
|
|
||
| // Set to true to use debug for JNI. | ||
| wpi.java.debugJni = false | ||
|
|
||
| // Set this to true to enable desktop support. | ||
| def includeDesktopSupport = true | ||
|
|
||
| allprojects { | ||
| repositories { | ||
| maven { url 'https://jitpack.io' }//for lib199 | ||
| } | ||
| } | ||
|
|
||
| // Don't cache changing modules | ||
| configurations.all { | ||
| resolutionStrategy.cacheChangingModulesFor 0, 'seconds' | ||
| } | ||
|
|
||
| // Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries. | ||
| // Also defines JUnit 5. | ||
| dependencies { | ||
| implementation wpi.java.deps.wpilib() | ||
| implementation wpi.java.vendor.java() | ||
|
|
||
| roborioDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.roborio) | ||
| roborioDebug wpi.java.vendor.jniDebug(wpi.platforms.roborio) | ||
|
|
||
| roborioRelease wpi.java.deps.wpilibJniRelease(wpi.platforms.roborio) | ||
| roborioRelease wpi.java.vendor.jniRelease(wpi.platforms.roborio) | ||
|
|
||
| nativeDebug wpi.java.deps.wpilibJniDebug(wpi.platforms.desktop) | ||
| nativeDebug wpi.java.vendor.jniDebug(wpi.platforms.desktop) | ||
| simulationDebug wpi.sim.enableDebug() | ||
|
|
||
| nativeRelease wpi.java.deps.wpilibJniRelease(wpi.platforms.desktop) | ||
| nativeRelease wpi.java.vendor.jniRelease(wpi.platforms.desktop) | ||
| simulationRelease wpi.sim.enableRelease() | ||
|
|
||
| testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1' | ||
| implementation "com.github.deepbluerobotics:lib199:0ce129844b9b918dad0207c0e1020fc26588f461" | ||
| } | ||
|
|
||
| test { | ||
| useJUnitPlatform() | ||
| systemProperty 'junit.jupiter.extensions.autodetection.enabled', 'true' | ||
| } | ||
|
|
||
| // Simulation configuration (e.g. environment variables). | ||
| wpi.sim.addGui().defaultEnabled = true | ||
| wpi.sim.addDriverstation() | ||
|
|
||
| // Setting up my Jar File. In this case, adding all libraries into the main jar ('fat jar') | ||
| // in order to make them all available at runtime. Also adding the manifest so WPILib | ||
| // knows where to look for our Robot Class. | ||
| jar { | ||
| from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } | ||
| from sourceSets.main.allSource | ||
| manifest edu.wpi.first.gradlerio.GradleRIOPlugin.javaManifest(ROBOT_MAIN_CLASS) | ||
| duplicatesStrategy = DuplicatesStrategy.INCLUDE | ||
| } | ||
|
|
||
| // Configure jar and deploy tasks | ||
| deployArtifact.jarTask = jar | ||
| wpi.java.configureExecutableTasks(jar) | ||
| wpi.java.configureTestTasks(test) | ||
|
|
||
| // Configure string concat to always inline compile | ||
| tasks.withType(JavaCompile) { | ||
| options.compilerArgs.add '-XDstringConcat=inline' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=permwrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip | ||
| networkTimeout=10000 | ||
| validateDistributionUrl=true | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=permwrapper/dists | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=permwrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip | ||
| networkTimeout=10000 | ||
| validateDistributionUrl=true | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=permwrapper/dists |
Oops, something went wrong.