Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify Gradle Configurations #324

Merged
merged 9 commits into from
May 23, 2022
Next Next commit
Gradle: Set protobuf plugin version globally
alvasw committed May 23, 2022
commit 2d8e89b6b9d33a68b8eb7a180a80543a5b9c164f
8 changes: 8 additions & 0 deletions build-logic/commons/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
plugins {
id 'groovy-gradle-plugin'
}

repositories {
gradlePluginPortal()
}

dependencies {
implementation libs.protobuf.gradle.plugin
}
8 changes: 8 additions & 0 deletions build-logic/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
dependencyResolutionManagement {
versionCatalogs {
libs {
from(files("../gradle/libs.versions.toml"))
}
}
}

include 'commons'
include 'regtest'
9 changes: 0 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
}
}

plugins {
id 'java'
id 'bisq.gradle.regtest.BisqRegtestPlugin'
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -38,8 +38,8 @@ logback-lib = { strictly = '1.2.11' }
lombok-lib = { strictly = '1.18.22' }
openjfx-plugin = { strictly = '0.0.12' }

protobuf-plugin = { strictly = '0.8.18' }
protobuf-java-lib = { strictly = '3.19.4' }
protobuf-gradle-plugin-lib = { strictly = '0.8.18' }

shadow-plugin = { strictly = '7.1.2' }
slf4j-lib = { strictly = '1.7.36' }
@@ -97,6 +97,7 @@ logback-classic = { module = 'ch.qos.logback:logback-classic', version.ref = 'lo
lombok = { module = 'org.projectlombok:lombok', version.ref = 'lombok-lib' }

protobuf-java = { module = 'com.google.protobuf:protobuf-java', version.ref = 'protobuf-java-lib' }
protobuf-gradle-plugin = { module = 'gradle.plugin.com.google.protobuf:protobuf-gradle-plugin', version.ref = 'protobuf-gradle-plugin-lib' }
protobuf-java-util = { module = 'com.google.protobuf:protobuf-java-util', version.ref = 'protobuf-java-lib' }

slf4j-api = { module = 'org.slf4j:slf4j-api', version.ref = 'slf4j-lib' }
@@ -126,5 +127,4 @@ springfox-libs = ['springfox-boot-starter', 'springfox-swagger2', 'springfox-swa
kotlindsl = { id = 'org.gradle.kotlin.kotlin-dsl', version.ref = 'kotlindsl-plugin' }
jpackage = { id = 'org.panteleyev.jpackageplugin', version.ref = 'jpackage-plugin' }
openjfx = { id = 'org.openjfx.javafxplugin', version.ref = 'openjfx-plugin' }
protobuf = { id = 'com.google.protobuf', version.ref = 'protobuf-plugin' }
shadow = { id = 'com.github.johnrengelman.shadow', version.ref = 'shadow-plugin' }