Skip to content

Commit

Permalink
Update for 2019.1.1 release (#280)
Browse files Browse the repository at this point in the history
* Update for 2019.1.1 release

* Remove beta warning

* Update example versions
  • Loading branch information
PeterJohnson authored and JaciBrunning committed Jan 2, 2019
1 parent 091342f commit e97b7e7
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 22 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ compileGroovy {

allprojects {
group = "edu.wpi.first"
version = "2019.1.1-beta-4c"
version = "2019.1.1"

if (project.hasProperty('publishVersion')) {
version = project.publishVersion
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "cpp"
id "google-test-test-suite"
id "edu.wpi.first.GradleRIO" version "2019.1.1-beta-4c"
id "edu.wpi.first.GradleRIO" version "2019.1.1"
}

// Define my targets (RoboRIO) and artifacts (deployable files)
Expand Down
2 changes: 1 addition & 1 deletion examples/java/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "edu.wpi.first.GradleRIO" version "2019.1.1-beta-4c"
id "edu.wpi.first.GradleRIO" version "2019.1.1"
}

def ROBOT_MAIN_CLASS = "frc.team0000.robot.Main"
Expand Down
2 changes: 1 addition & 1 deletion examples/kotlin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "org.jetbrains.kotlin.jvm" version "1.3.11"
id "edu.wpi.first.GradleRIO" version "2019.1.1-beta-4c"
id "edu.wpi.first.GradleRIO" version "2019.1.1"
}

def ROBOT_MAIN_CLASS = "frc.team0000.robot.MainKt"
Expand Down
16 changes: 8 additions & 8 deletions src/main/groovy/edu/wpi/first/gradlerio/wpi/WPIExtension.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import javax.inject.Inject
@CompileStatic
class WPIExtension {
// WPILib (first.wpi.edu/FRC/roborio/maven) libs
String wpilibVersion = "2019.1.1-beta-4"
String niLibrariesVersion = "2019.9.3"
String wpilibVersion = "2019.1.1"
String niLibrariesVersion = "2019.12.1"
String opencvVersion = "3.4.4-4"
static final String[] validImageVersions = ['2019_v9']
static final String[] validImageVersions = ['2019_v12']

String wpilibYear = '2019'

Expand All @@ -24,11 +24,11 @@ class WPIExtension {
String jreArtifactLocation = "edu.wpi.first.jdk:roborio-2019:11.0.1u13-1"

// WPILib (first.wpi.edu/FRC/roborio/maven) Utilities
String smartDashboardVersion = "2019.1.1-beta-4"
String shuffleboardVersion = "2019.1.1-beta-4"
String outlineViewerVersion = "2019.1.1-beta-4"
String robotBuilderVersion = "2019.1.1-beta-4"
String pathWeaverVersion = "2019.1.1-beta-3"
String smartDashboardVersion = "2019.1.1"
String shuffleboardVersion = "2019.1.1"
String outlineViewerVersion = "2019.1.1"
String robotBuilderVersion = "2019.1.1"
String pathWeaverVersion = "2019.1.1"

// WPILib Toolchain (https://github.com/wpilibsuite/toolchain-builder/releases/latest) version and tag
String toolchainTag = 'v2019-3'
Expand Down
10 changes: 0 additions & 10 deletions src/main/groovy/edu/wpi/first/gradlerio/wpi/WPIPlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,7 @@ class WPIPlugin implements Plugin<Project> {
}
}

// TODO: Remove for stable
project.afterEvaluate {
if (!_beta_warn) {
def style = StyledTextOutput.Style.SuccessHeader
logger.withLock {
logger.logStyle("NOTE: You are using a BETA version of GradleRIO, designed for the 2019 Season!", style)
logger.logStyle("This release requires the 2019 RoboRIO Image, and may be unstable. Do not use this for the official competition season.", style)
logger.logStyle("If you encounter any issues and/or bugs, please report them to https://github.com/wpilibsuite/GradleRIO", style)
}
_beta_warn = true;
}
addMavenRepositories(project, wpiExtension)
}

Expand Down

0 comments on commit e97b7e7

Please sign in to comment.