From 064078d4d9f719082c32c5a4b19de055710972c1 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Fri, 11 Jun 2021 17:50:53 +0200
Subject: [PATCH] build logic cleanup
- remove jcenter
- do not use "apply plugin"
- put versions use in multiple places in variables
---
.../main/groovy/ros3rag.java-jastadd-conventions.gradle | 1 +
gradle.properties | 3 ++-
ros3rag.common/build.gradle | 7 +++----
ros3rag.common/src/main/resources/tasks.gradle | 2 --
ros3rag.placeA/build.gradle | 2 +-
ros3rag.placeB/build.gradle | 2 +-
settings.gradle | 9 ++++++---
7 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/buildSrc/src/main/groovy/ros3rag.java-jastadd-conventions.gradle b/buildSrc/src/main/groovy/ros3rag.java-jastadd-conventions.gradle
index a2eada8..9549924 100644
--- a/buildSrc/src/main/groovy/ros3rag.java-jastadd-conventions.gradle
+++ b/buildSrc/src/main/groovy/ros3rag.java-jastadd-conventions.gradle
@@ -2,6 +2,7 @@ plugins {
id 'ros3rag.java-common-conventions'
id 'java-library'
id 'idea'
+ id 'org.jastadd'
}
dependencies {
diff --git a/gradle.properties b/gradle.properties
index 054aadd..22f6318 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,7 @@
jackson_version = 2.12.3
jupiter_version = 5.8.0-M1
assertj_version = 3.19.0
-apache_httpcomponents_version = 4.5.8
log4j_version = 2.14.1
protobuf_version = 4.0.0-rc-2
+protobuf_plugin_version = 0.8.16
+jastadd_gradle_version = 1.13.3
diff --git a/ros3rag.common/build.gradle b/ros3rag.common/build.gradle
index 40c0c7f..25432f5 100644
--- a/ros3rag.common/build.gradle
+++ b/ros3rag.common/build.gradle
@@ -1,17 +1,16 @@
buildscript {
- repositories.jcenter()
+ repositories.mavenCentral()
dependencies {
- classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.16'
+ classpath "com.google.protobuf:protobuf-gradle-plugin:${protobuf_plugin_version}"
}
}
plugins {
id 'ros3rag.java-application-conventions'
id 'java-library'
+ id "com.google.protobuf" version "${protobuf_plugin_version}"
}
-apply plugin: 'com.google.protobuf'
-
dependencies {
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: "${jackson_version}"
api group: 'com.google.protobuf', name: 'protobuf-java', version: "${protobuf_version}"
diff --git a/ros3rag.common/src/main/resources/tasks.gradle b/ros3rag.common/src/main/resources/tasks.gradle
index 2d78872..1a8119d 100644
--- a/ros3rag.common/src/main/resources/tasks.gradle
+++ b/ros3rag.common/src/main/resources/tasks.gradle
@@ -1,6 +1,4 @@
-apply plugin: 'jastadd'
-
dependencies {
// jastadd2 "org.jastadd:jastadd:2.3.5"
jastadd2 fileTree(include: ['jastadd2.jar'], dir: '../libs')
diff --git a/ros3rag.placeA/build.gradle b/ros3rag.placeA/build.gradle
index 69f31e9..5e90f00 100644
--- a/ros3rag.placeA/build.gradle
+++ b/ros3rag.placeA/build.gradle
@@ -1,7 +1,7 @@
buildscript {
repositories.mavenCentral()
dependencies {
- classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
+ classpath group: 'org.jastadd', name: 'jastaddgradle', version: "${jastadd_gradle_version}"
}
}
diff --git a/ros3rag.placeB/build.gradle b/ros3rag.placeB/build.gradle
index d273f65..0df9901 100644
--- a/ros3rag.placeB/build.gradle
+++ b/ros3rag.placeB/build.gradle
@@ -2,7 +2,7 @@ buildscript {
repositories.mavenLocal()
repositories.mavenCentral()
dependencies {
- classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
+ classpath group: 'org.jastadd', name: 'jastaddgradle', version: "${jastadd_gradle_version}"
}
}
diff --git a/settings.gradle b/settings.gradle
index bd2c1a8..19ff0e6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,11 @@
+pluginManagement {
+ plugins {
+ id 'org.jastadd' version "${jastadd_gradle_version}"
+ }
+}
+
rootProject.name = 'ros3rag'
include 'ros3rag.placeA'
include 'ros3rag.placeB'
include 'ros3rag.common'
-
-// include 'ros3rag.senderstub'
-// include 'ros3rag.receiverstub'
--
GitLab