From 064989f2e489bb0ea53db7bc9a4f1846e591f567 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 17 Jun 2018 19:59:49 -0700 Subject: [PATCH] Fix projects having different version numbers (#1113) --- build.gradle | 2 +- ni-libraries/publish.gradle | 7 ------- shared/java/javacommon.gradle | 7 ------- shared/javacpp/publish.gradle | 7 ------- shared/jni/publish.gradle | 7 ------- shared/plugins/publish.gradle | 7 ------- wpilibc/publish.gradle | 7 ------- wpilibcExamples/publish.gradle | 7 ------- wpilibjExamples/publish.gradle | 7 ------- 9 files changed, 1 insertion(+), 57 deletions(-) diff --git a/build.gradle b/build.gradle index 30e71047c3..489e6be8f0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'net.ltgt.errorprone' version '0.0.13' id "base" - id 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' version '2.0' + id 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' version '2.1' id 'edu.wpi.first.NativeUtils' version '1.6.7' id "edu.wpi.first.GradleJni" version "0.2.2" id 'idea' diff --git a/ni-libraries/publish.gradle b/ni-libraries/publish.gradle index 132b5d03e3..45b67877db 100644 --- a/ni-libraries/publish.gradle +++ b/ni-libraries/publish.gradle @@ -1,11 +1,4 @@ apply plugin: 'maven-publish' -apply plugin: 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' - -if (!hasProperty('releaseType')) { - WPILibVersion { - releaseType = 'dev' - } -} def pubVersion if (project.hasProperty("publishVersion")) { diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle index 0265d2e912..0b512735f3 100644 --- a/shared/java/javacommon.gradle +++ b/shared/java/javacommon.gradle @@ -1,14 +1,7 @@ apply plugin: 'maven-publish' -apply plugin: 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' apply plugin: 'java' apply plugin: 'net.ltgt.errorprone' -if (!hasProperty('releaseType')) { - WPILibVersion { - releaseType = 'dev' - } -} - def pubVersion if (project.hasProperty("publishVersion")) { pubVersion = project.publishVersion diff --git a/shared/javacpp/publish.gradle b/shared/javacpp/publish.gradle index 341527b916..1c945229d6 100644 --- a/shared/javacpp/publish.gradle +++ b/shared/javacpp/publish.gradle @@ -1,11 +1,4 @@ apply plugin: 'maven-publish' -apply plugin: 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' - -if (!hasProperty('releaseType')) { - WPILibVersion { - releaseType = 'dev' - } -} def pubVersion if (project.hasProperty("publishVersion")) { diff --git a/shared/jni/publish.gradle b/shared/jni/publish.gradle index d13c4a0f06..4a92b148a8 100644 --- a/shared/jni/publish.gradle +++ b/shared/jni/publish.gradle @@ -1,11 +1,4 @@ apply plugin: 'maven-publish' -apply plugin: 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' - -if (!hasProperty('releaseType')) { - WPILibVersion { - releaseType = 'dev' - } -} def pubVersion if (project.hasProperty("publishVersion")) { diff --git a/shared/plugins/publish.gradle b/shared/plugins/publish.gradle index 4e0fc6bc3c..4c94d1e098 100644 --- a/shared/plugins/publish.gradle +++ b/shared/plugins/publish.gradle @@ -1,11 +1,4 @@ apply plugin: 'maven-publish' -apply plugin: 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' - -if (!hasProperty('releaseType')) { - WPILibVersion { - releaseType = 'dev' - } -} def pubVersion = '' if (project.hasProperty("publishVersion")) { diff --git a/wpilibc/publish.gradle b/wpilibc/publish.gradle index 37b43b8a36..b40d916d8e 100644 --- a/wpilibc/publish.gradle +++ b/wpilibc/publish.gradle @@ -1,11 +1,4 @@ apply plugin: 'maven-publish' -apply plugin: 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' - -if (!hasProperty('releaseType')) { - WPILibVersion { - releaseType = 'dev' - } -} def pubVersion = '' if (project.hasProperty("publishVersion")) { diff --git a/wpilibcExamples/publish.gradle b/wpilibcExamples/publish.gradle index 2ba4e65e63..7832a3d3b0 100644 --- a/wpilibcExamples/publish.gradle +++ b/wpilibcExamples/publish.gradle @@ -1,11 +1,4 @@ apply plugin: 'maven-publish' -apply plugin: 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' - -if (!hasProperty('releaseType')) { - WPILibVersion { - releaseType = 'dev' - } -} def pubVersion if (project.hasProperty("publishVersion")) { diff --git a/wpilibjExamples/publish.gradle b/wpilibjExamples/publish.gradle index 3457cd0c9b..9cb5be907a 100644 --- a/wpilibjExamples/publish.gradle +++ b/wpilibjExamples/publish.gradle @@ -1,11 +1,4 @@ apply plugin: 'maven-publish' -apply plugin: 'edu.wpi.first.wpilib.versioning.WPILibVersioningPlugin' - -if (!hasProperty('releaseType')) { - WPILibVersion { - releaseType = 'dev' - } -} def pubVersion if (project.hasProperty("publishVersion")) {