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.

Sign up for GitHub

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

Gradle release test #583

Merged
merged 5 commits into from
Apr 19, 2024
Merged

Gradle release test #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
273e501
test release
drallgood Apr 19, 2024
313983b
[Gradle Release Plugin] - pre tag commit: '0.4.0'.
drallgood Apr 19, 2024
6adf40d
[Gradle Release Plugin] - new version commit: '0.4.1-SNAPSHOT'.
drallgood Apr 19, 2024
37b07ea
[Gradle Release Plugin] - pre tag commit: '0.4.0'.
drallgood Apr 19, 2024
906617e
prepare for 0.4.1-SNAPSHOT
drallgood Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-logic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {

dependencies {
implementation(libs.com.benjaminsproule.license)
implementation(libs.net.researchgate.release)
// implementation(libs.net.researchgate.release)
}

repositories {
Expand Down
9 changes: 6 additions & 3 deletions build-logic/src/main/kotlin/de.brendamour.java-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import java.util.*
import net.researchgate.release.ReleaseExtension
import net.researchgate.release.tasks.CommitNewVersion
//import net.researchgate.release.ReleaseExtension
//import net.researchgate.release.tasks.CommitNewVersion
/*
* This file was generated by the Gradle 'init' task.
*
Expand Down Expand Up @@ -46,6 +46,8 @@ publishing {
pom {
description = "Java Library for Apple PassBook Web Service API (PARENT POM)"
url.set("https://github.com/drallgood/jpasskit")
name.set(project.displayName)
description.set(project.description)
inceptionYear.set("2012")
licenses {
license {
Expand Down Expand Up @@ -102,6 +104,7 @@ license {
excludes(arrayListOf("*pom.xml","*.checkstyle","**/*.cer","**/*.pem","**/*.p12","**/*.ignored_file","site/*","**/*.json","**/*.png"))
}

/*
apply(plugin = "net.researchgate.release")

configure<ReleaseExtension> {
Expand All @@ -113,4 +116,4 @@ configure<ReleaseExtension> {
tasks.withType<CommitNewVersion> {
dependsOn("publishToSonatype")
dependsOn("closeAndReleaseSonatypeStagingRepository")
}
}*/
14 changes: 12 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import org.gradle.tooling.GradleConnector
import net.researchgate.release.ReleaseExtension
import net.researchgate.release.tasks.UpdateVersion

plugins {
alias(libs.plugins.io.github.gradle.nexus.publish.plugin)
alias(libs.plugins.net.researchgate.release)
`maven-publish`
}

allprojects {
group = "de.brendamour"
version = "0.4.0-SNAPSHOT"
}

nexusPublishing {
Expand All @@ -25,6 +27,14 @@ subprojects {

}

configure<ReleaseExtension> {
with(git) {
requireBranch.set("master")
}
}



// Workaround for https://github.com/researchgate/gradle-release/issues/184
configure(listOf(tasks.release, tasks.runBuildTasks)) {
configure {
Expand All @@ -48,4 +58,4 @@ configure(listOf(tasks.release, tasks.runBuildTasks)) {
}
}
}
}
}
1 change: 1 addition & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
version=0.4.1-SNAPSHOT
2 changes: 1 addition & 1 deletion jpasskit.server/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
api(libs.org.restlet.jse.org.restlet.ext.simple)
}

description = "jPasskit Server"
description = "Java Server Example for Apple PassBook Web Service API"

java {
withJavadocJar()
Expand Down
135 changes: 0 additions & 135 deletions jpasskit.server/pom.xml
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions jpasskit/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

plugins {
id("de.brendamour.java-conventions")
id("net.researchgate.release")
}

dependencies {
Expand All @@ -23,10 +22,9 @@ dependencies {
testImplementation(libs.org.assertj.assertj.core)
testImplementation(libs.org.mockito.mockito.core)
testImplementation(libs.org.testng.testng)
implementation(libs.net.researchgate.release)
}

description = "jPasskit"
description = "Java Library for Apple PassBook Web Service API<"

java {
withJavadocJar()
Expand Down
Loading
Loading