From a8578c32c6d16a1ae2be623962bfbf6d16085454 Mon Sep 17 00:00:00 2001 From: Saraansh Wadkar Date: Sat, 7 Jan 2023 12:06:46 -0500 Subject: [PATCH] test6 --- build.gradle | 89 +++++----------------------------------------------- 1 file changed, 7 insertions(+), 82 deletions(-) diff --git a/build.gradle b/build.gradle index 351d25e..de96ab7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -import edu.wpi.first.gradlerio.deploy.roborio.RoboRIO - plugins { id "idea" id 'maven-publish' @@ -10,49 +8,7 @@ plugins { id "org.jetbrains.kotlinx.kover" version "0.4.2" } -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 - // do not change main class (does not run without it being Main -def ROBOT_MAIN_CLASS = "frc.robot.Main" -def TEAM = 4099 - -// Define my targets (RoboRIO) and artifacts (deployable files) -// This is added by GradleRIO's backing project EmbeddedTools. -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 = TEAM - 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 - repositories { mavenCentral() jcenter() @@ -72,44 +28,20 @@ configurations.all { // Defining my dependencies. In this case, WPILib (+ friends) 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-api:5.7.2" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.2" implementation "org.jetbrains.kotlin:kotlin-stdlib" + implementation "edu.wpi.first.wpimath:wpimath-java:2023.1.1" + implementation "edu.wpi.first.wpiutil:wpiutil-java:2023.1.1" + + implementation wpi.java.deps.wpilib() + implementation wpi.java.vendor.java() + // We need to add the Kotlin stdlib in order to use most Kotlin language features. // compile "org.jetbrains.kotlin:kotlin-stdlib" } -// 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) } } - manifest edu.wpi.first.gradlerio.GradleRIOPlugin.javaManifest(ROBOT_MAIN_CLASS) - duplicatesStrategy = DuplicatesStrategy.INCLUDE -} - test { useJUnitPlatform() } @@ -119,7 +51,7 @@ publishing { release(MavenPublication) { groupId = 'org.team4099' artifactId = 'falconutils' - version = 'test5' + version = 'test6' from(components["kotlin"]) } @@ -176,10 +108,3 @@ gversion { indent = "\t" // optional. Change how code is indented. 1 tab is default. annotate = false // optional. Java only. Adds @Generated annotation } - - -project.compileKotlin.dependsOn(createVersionFile) -// Configure jar and deploy tasks -deployArtifact.jarTask = jar -wpi.java.configureExecutableTasks(jar) -wpi.java.configureTestTasks(test)