Skip to content
This repository was archived by the owner on Sep 22, 2022. It is now read-only.

Commit 84f3030

Browse files
Adven27Adven27
committed
migrate to gradle 7.0
1 parent ec395fc commit 84f3030

File tree

5 files changed

+61
-57
lines changed

5 files changed

+61
-57
lines changed

‎.github/workflows/gradle-publish.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# This workflow will build a package using Gradle and then publish it to Bintray packages when a release is created
2-
name: Bintray Publish
1+
# This workflow will build a package using Gradle and then publish it
2+
name: Maven Publish
33

44
on:
55
release:
@@ -20,12 +20,13 @@ jobs:
2020
- name: Build
2121
run: gradle build
2222

23-
- name: Publish to Bintray
24-
run: gradle publish
23+
- name: Publish
24+
run: gradle publishMaven
2525
env:
26-
bintrayKey: ${{ secrets.BINTRAY_KEY }}
2726
ossrhUsername: ${{ secrets.OSSRHUSERNAME }}
2827
ossrhPassword: ${{ secrets.OSSRHPASSWORD }}
28+
ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRHUSERNAME }}
29+
ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRHPASSWORD }}
2930
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEY }}
3031
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
3132

‎build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ subprojects {
7272
apply from: "$rootDir/gradle/linters.gradle"
7373
}
7474

75-
task publish {
76-
dependsOn ":exam-core:uploadArchives"
77-
dependsOn ":exam-db:uploadArchives"
78-
dependsOn ":exam-ws:uploadArchives"
79-
dependsOn ":exam-mq:uploadArchives"
80-
dependsOn ":exam-mq-rabbit:uploadArchives"
81-
dependsOn ":exam-mq-kafka:uploadArchives"
82-
dependsOn ":exam-mq-ibmmq:uploadArchives"
83-
dependsOn ":exam-mq-redis:uploadArchives"
84-
dependsOn ":exam-files:uploadArchives"
85-
dependsOn ":exam-ui:uploadArchives"
86-
dependsOn ":exam-ms:uploadArchives"
75+
task publishMaven {
76+
dependsOn ":exam-core:publish"
77+
dependsOn ":exam-db:publish"
78+
dependsOn ":exam-ws:publish"
79+
dependsOn ":exam-mq:publish"
80+
dependsOn ":exam-mq-rabbit:publish"
81+
dependsOn ":exam-mq-kafka:publish"
82+
dependsOn ":exam-mq-ibmmq:publish"
83+
dependsOn ":exam-mq-redis:publish"
84+
dependsOn ":exam-files:publish"
85+
dependsOn ":exam-ui:publish"
86+
dependsOn ":exam-ms:publish"
8787
}

‎gradle.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ossrhUsername=adven27
2+
ossrhPassword=
3+
signingPassword=
4+
signingKey=

‎gradle/publish.gradle

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,56 +13,56 @@ artifacts {
1313
archives sourcesJar, javadocJar
1414
}
1515

16-
apply plugin: 'signing'
17-
signing {
18-
if (project.hasProperty('signingKey') && project.hasProperty('signingPassword')) {
19-
useInMemoryPgpKeys(project.getProperty('signingKey'), project.getProperty('signingPassword'))
20-
sign configurations.archives
21-
}
22-
}
23-
24-
apply plugin: 'maven'
25-
uploadArchives {
26-
repositories {
27-
mavenDeployer {
28-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
29-
30-
repository(url: "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
31-
authentication(userName: System.getenv("ossrhUsername"), password: System.getenv("ossrhPassword"))
32-
}
33-
34-
snapshotRepository(url: "https://s01.oss.sonatype.org/content/repositories/snapshots/") {
35-
authentication(userName: System.getenv("ossrhUsername"), password: System.getenv("ossrhPassword"))
36-
}
37-
38-
pom.project {
39-
name project.name
40-
packaging 'jar'
41-
artifactId project.name
42-
description 'Extension for Concordion BDD Framework'
43-
url 'https://github.com/Adven27/Exam'
16+
apply plugin: 'maven-publish'
17+
publishing {
18+
publications {
19+
mavenJava(MavenPublication) {
20+
artifactId = project.name
21+
from components.java
22+
pom {
23+
name = project.name
24+
description = 'Extension for Concordion BDD Framework'
25+
url = 'https://github.com/Adven27/Exam'
4426

4527
licenses {
4628
license {
47-
name "The Apache Software License, Version 2.0"
48-
url "http://www.apache.org/licenses/LICENSE-2.0.txt"
29+
name = "The Apache Software License, Version 2.0"
30+
url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
4931
}
5032
}
51-
5233
developers {
5334
developer {
54-
id "Adven27"
55-
name "Nikolai Toropanov"
56-
email "[email protected]"
35+
id = "Adven27"
36+
name = "Nikolai Toropanov"
37+
email = "[email protected]"
5738
}
5839
}
59-
6040
scm {
61-
url "https://github.com/Adven27/Exam"
62-
connection 'scm:git:git://github.com/Adven27/Exam.git'
63-
developerConnection 'scm:git:git://github.com/Adven27/Exam.git'
41+
url = "https://github.com/Adven27/Exam"
42+
connection = 'scm:git:git://github.com/Adven27/Exam.git'
43+
developerConnection = 'scm:git:git://github.com/Adven27/Exam.git'
44+
}
45+
}
46+
repositories {
47+
maven {
48+
name = 'ossrh'
49+
credentials(PasswordCredentials)
50+
url = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
6451
}
6552
}
6653
}
6754
}
55+
}
56+
57+
apply plugin: 'signing'
58+
signing {
59+
if (project.hasProperty('signingKey') && project.hasProperty('signingPassword')) {
60+
useInMemoryPgpKeys(project.getProperty('signingKey'), project.getProperty('signingPassword'))
61+
sign publishing.publications.mavenJava
62+
}
63+
}
64+
65+
java {
66+
withSourcesJar()
67+
withJavadocJar()
6868
}

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Wed May 22 10:50:03 MSK 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

0 commit comments

Comments
 (0)