ChangeLogs: * https://gitlab.com/signald/signald/-/tags/0.16.0 * https://gitlab.com/signald/signald/-/tags/0.16.1 * https://gitlab.com/signald/signald/-/tags/0.17.0main
parent
377917b524
commit
8a6b41d271
@ -0,0 +1,35 @@ |
|||||||
|
From 232c692240b9c52b95bd38ba7aecb11e7077cf31 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||||
|
Date: Sat, 26 Feb 2022 12:33:13 +0100
|
||||||
|
Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD
|
||||||
|
|
||||||
|
---
|
||||||
|
build.gradle | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/build.gradle b/build.gradle
|
||||||
|
index cbb587f..3b06e80 100644
|
||||||
|
--- a/build.gradle
|
||||||
|
+++ b/build.gradle
|
||||||
|
@@ -82,6 +82,9 @@ static String getVersion() {
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
|
||||||
|
+ maven {
|
||||||
|
+ url "https://plugins.gradle.org/m2/"
|
||||||
|
+ }
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -102,6 +105,8 @@ dependencies {
|
||||||
|
implementation 'io.prometheus:simpleclient_httpserver:0.14.1'
|
||||||
|
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
|
||||||
|
implementation 'io.sentry:sentry:5.6.1'
|
||||||
|
+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3'
|
||||||
|
+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31'
|
||||||
|
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.33.1
|
||||||
|
|
@ -0,0 +1,60 @@ |
|||||||
|
From 80277ce9e24d9efa8dfd6eb775187c823e0e528e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||||
|
Date: Sat, 26 Feb 2022 12:36:15 +0100
|
||||||
|
Subject: [PATCH 2/2] buildconfig/local deps fixes
|
||||||
|
|
||||||
|
---
|
||||||
|
build.gradle | 20 ++++++++++++++++++--
|
||||||
|
1 file changed, 18 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/build.gradle b/build.gradle
|
||||||
|
index cbb587f..ad836cf 100644
|
||||||
|
--- a/build.gradle
|
||||||
|
+++ b/build.gradle
|
||||||
|
@@ -9,10 +9,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal
|
||||||
|
import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
|
||||||
|
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
||||||
|
|
||||||
|
+buildscript {
|
||||||
|
+ repositories {
|
||||||
|
+ maven {
|
||||||
|
+ url(uri("@deps@"))
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ dependencies {
|
||||||
|
+ classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.3"
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
plugins {
|
||||||
|
- id 'com.github.gmazzo.buildconfig' version '3.0.3'
|
||||||
|
id 'application'
|
||||||
|
}
|
||||||
|
+apply plugin: "com.github.gmazzo.buildconfig"
|
||||||
|
|
||||||
|
compileJava.options.encoding = 'UTF-8'
|
||||||
|
|
||||||
|
@@ -82,7 +93,10 @@ static String getVersion() {
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
|
||||||
|
- mavenCentral()
|
||||||
|
+ mavenLocal()
|
||||||
|
+ maven {
|
||||||
|
+ url uri("@deps@")
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
@@ -102,6 +116,8 @@ dependencies {
|
||||||
|
implementation 'io.prometheus:simpleclient_httpserver:0.14.1'
|
||||||
|
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
|
||||||
|
implementation 'io.sentry:sentry:5.6.1'
|
||||||
|
+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3'
|
||||||
|
+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31'
|
||||||
|
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.33.1
|
||||||
|
|
@ -1,19 +0,0 @@ |
|||||||
diff --git a/build.gradle b/build.gradle
|
|
||||||
index 11d7a99..66805bb 100644
|
|
||||||
--- a/build.gradle
|
|
||||||
+++ b/build.gradle
|
|
||||||
@@ -18,9 +18,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
|
|
||||||
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
|
||||||
import org.xml.sax.SAXParseException
|
|
||||||
|
|
||||||
-plugins {
|
|
||||||
- id 'de.fuerstenau.buildconfig' version '1.1.8'
|
|
||||||
+buildscript {
|
|
||||||
+ dependencies {
|
|
||||||
+ classpath files ("BuildConfig.jar")
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
+apply plugin: 'de.fuerstenau.buildconfig'
|
|
||||||
|
|
||||||
apply plugin: 'java'
|
|
||||||
apply plugin: 'application'
|
|
Loading…
Reference in new issue