Skip to content

Commit 3f2f958

Browse files
committed
Fix publishing
1 parent 5a0e8cf commit 3f2f958

1 file changed

Lines changed: 33 additions & 33 deletions

File tree

build.gradle

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111

1212
allprojects {
1313
group = "gg.soltera"
14-
version = "3.0.3a"
14+
version = "3.0.3b"
1515

1616
// java plugin is applied in subprojects
1717
apply plugin: "jacoco"
@@ -21,7 +21,7 @@ allprojects {
2121
// Solution: "I solved it. I put a publishing configuration into subprojects section, but applied plugin to a root project."
2222
// Solution source: https://discuss.gradle.org/t/problem-with-publishing-with-maven-publish-in-a-multi-module-project/1695/2
2323
apply plugin: "maven-publish"
24-
24+
2525
// Use JaCoCo 0.8.6 for (experimental) support for Java 15 class files.
2626
jacoco { toolVersion = "0.8.6" }
2727

@@ -33,7 +33,7 @@ allprojects {
3333
// Main publishing repo
3434
maven {
3535
name = "GitHubPackages"
36-
url = uri("https://maven.pkg.github.com/DumbDogDiner/StickyAPI")
36+
url = uri("https://maven.pkg.github.com/SolteraGG/StickyAPI")
3737
credentials {
3838
username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")
3939
password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
@@ -106,7 +106,7 @@ allprojects {
106106
println("Unresolvable packages check for project '$project.name' completed successfully!")
107107
}
108108
}
109-
109+
110110
// Finalize the build task with this task on every project.
111111
build.finalizedBy checkForUnresolvablePackages
112112
// -------------------------
@@ -137,7 +137,7 @@ allprojects {
137137
subprojects {
138138
apply plugin: "io.freefair.lombok"
139139
apply plugin: "com.diffplug.spotless"
140-
140+
141141
// apply the java plugin here since root uses java-platform
142142
apply plugin: "java"
143143

@@ -176,9 +176,9 @@ subprojects {
176176
// Note: Subprojects can't have repo overrides to we have to put it here
177177
// Define a Ivy repo for the font width data (that way we don't need another plugin!)
178178
def dddResources = ivy {
179-
url "https://solteragg.github.io/"
179+
url "https://solteragg.github.io/"
180180
patternLayout { artifact "/[module]/[revision]/[classifier].[ext]"}
181-
metadataSources { artifact() }
181+
metadataSources { artifact() }
182182
}
183183
// Only use the Ivy repo for font width data - speeds up dependency resolution
184184
exclusiveContent {
@@ -202,12 +202,12 @@ subprojects {
202202
}
203203

204204
test {
205-
useJUnitPlatform()
206-
testLogging {
207-
events "passed", "skipped", "failed"
205+
useJUnitPlatform()
206+
testLogging {
207+
events "passed", "skipped", "failed"
208208
// Show System.out for code ran by tests
209209
showStandardStreams = true
210-
}
210+
}
211211
finalizedBy jacocoTestReport // report is always generated after tests run
212212
}
213213

@@ -295,35 +295,35 @@ task copySubprojectJars(type: Copy, dependsOn: subprojects.jar) {
295295
dependsOn(":common:commonSources")
296296

297297
// Copy subproject jar and sources
298-
from(subprojects.jar)
298+
from(subprojects.jar)
299299
from(subprojects.sources)
300300
into rootProject.file("build/libs/modules")
301301
}
302302

303303
// Generate an additional jacoco report project-wide
304304
// src: https://github.com/gradle/gradle/issues/10708#issuecomment-566279825
305305
task rootJacocoMergedReport(type: JacocoReport) {
306-
// Gradle 7 implicit dependency fixes
307-
// -------------------------
308-
dependsOn(subprojects.test)
309-
dependsOn(subprojects.javadoc)
310-
311-
dependsOn(subprojects.delombok)
312-
dependsOn(subprojects.jacocoTestReport)
313-
314-
dependsOn(aggregateJavadoc)
315-
dependsOn(copySubprojectJars)
316-
dependsOn(rootTestReport)
317-
// -------------------------
318-
319-
additionalSourceDirs.setFrom files(subprojects.sourceSets.main.allSource.srcDirs)
320-
sourceDirectories.setFrom files(subprojects.sourceSets.main.allSource.srcDirs)
321-
classDirectories.setFrom files(subprojects.sourceSets.main.output)
322-
executionData.setFrom project.fileTree(dir: ".", include: "**/build/jacoco/test.exec")
323-
reports {
324-
xml.enabled true
325-
html.enabled true
326-
}
306+
// Gradle 7 implicit dependency fixes
307+
// -------------------------
308+
dependsOn(subprojects.test)
309+
dependsOn(subprojects.javadoc)
310+
311+
dependsOn(subprojects.delombok)
312+
dependsOn(subprojects.jacocoTestReport)
313+
314+
dependsOn(aggregateJavadoc)
315+
dependsOn(copySubprojectJars)
316+
dependsOn(rootTestReport)
317+
// -------------------------
318+
319+
additionalSourceDirs.setFrom files(subprojects.sourceSets.main.allSource.srcDirs)
320+
sourceDirectories.setFrom files(subprojects.sourceSets.main.allSource.srcDirs)
321+
classDirectories.setFrom files(subprojects.sourceSets.main.output)
322+
executionData.setFrom project.fileTree(dir: ".", include: "**/build/jacoco/test.exec")
323+
reports {
324+
xml.enabled true
325+
html.enabled true
326+
}
327327
}
328328

329329
// Root build: run copySubprojectJars after build

0 commit comments

Comments
 (0)