From 5d8dba3ea24a6a10d2510b7f240c52b11f53c590 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sun, 26 Apr 2020 16:49:14 +0100 Subject: [PATCH 1/3] gradle: make publishing easier --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 85aaf92a49..6149db0bae 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Owain van Brakel + * Copyright (c) 2019-2020 Owain van Brakel * All rights reserved. * * Redistribution and use in source and binary forms, with or without From 07151007ccc4db96ade9e1b4d7705df3f2f78680 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sun, 26 Apr 2020 16:49:56 +0100 Subject: [PATCH 2/3] Update build.gradle.kts --- build.gradle.kts | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6149db0bae..d99c3b02f6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -69,7 +69,17 @@ subprojects { if (System.getenv("JITPACK") != null) mavenLocal() jcenter() - maven(url = "https://jitpack.io") + exclusiveContent { + forRepository { + maven { + url = uri("https://jitpack.io") + } + } + filter { + includeGroup("com.github.petitparser.java-petitparser") + includeModule("com.github.petitparser", "java-petitparser") + } + } maven(url = "https://mvnrepository.com/artifact") exclusiveContent { @@ -125,6 +135,15 @@ subprojects { maven { url = uri("$buildDir/repo") } + if (System.getProperty("REPO-URL") != null) { + maven { + url = uri(System.getProperty("REPO-URL")) + credentials { + username = System.getProperty("REPO-USERNAME") + password = System.getProperty("REPO-PASSWORD") + } + } + } } publications { register("mavenJava", MavenPublication::class) { @@ -137,6 +156,8 @@ subprojects { java { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 + + withSourcesJar() } withType { From c15a2ed6188bcd1cd187b993878acdb4099152b4 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Sun, 26 Apr 2020 23:07:17 +0100 Subject: [PATCH 3/3] fix indent --- build.gradle.kts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d99c3b02f6..7c3b90fbbd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -70,15 +70,15 @@ subprojects { mavenLocal() jcenter() exclusiveContent { - forRepository { - maven { - url = uri("https://jitpack.io") - } - } - filter { - includeGroup("com.github.petitparser.java-petitparser") + forRepository { + maven { + url = uri("https://jitpack.io") + } + } + filter { + includeGroup("com.github.petitparser.java-petitparser") includeModule("com.github.petitparser", "java-petitparser") - } + } } maven(url = "https://mvnrepository.com/artifact")