Skip to content

Commit f731574

Browse files
committed
Revert "禁用buildSrc上传"
This reverts commit 6d6d7ce.
1 parent 56466bb commit f731574

File tree

4 files changed

+24
-26
lines changed

4 files changed

+24
-26
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ html
1919

2020
# MacOS
2121
.DS_Store
22+
/repo/

Diff for: build.gradle

+18-25
Original file line numberDiff line numberDiff line change
@@ -115,36 +115,29 @@ subprojects {
115115
archives javadocJar
116116
}
117117

118-
tasks.whenTaskAdded { task ->
119-
if (task.name.contains('uploadArchives') || task.name.contains("signArchives")) {
120-
task.enabled = new File(project.property('signing.secretKeyRingFile') as String).isFile()
121-
}
122-
}
123-
124-
signing {
125-
sign configurations.archives
126-
}
127-
128118
// gradle clean build uploadArchives -Dun=用户名 -Dps=密码 -x test
129119
uploadArchives {
130120
repositories {
131121
mavenDeployer {
132-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
133-
def userName = System.getProperty("un")
134-
def passWord = System.getProperty("ps")
135-
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
136-
//noinspection GroovyAssignabilityCheck
137-
authentication(userName: userName, password: passWord)
138-
}
139-
140-
snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
141-
//noinspection GroovyAssignabilityCheck
142-
authentication(userName: userName, password: passWord)
122+
def isLocal = Boolean.valueOf(project.properties.get("local"))
123+
if(isLocal){
124+
repository(url: uri('../repo'))
125+
}else {
126+
signing {
127+
sign configurations.archives
128+
}
129+
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
130+
def userName = System.getProperty("un")
131+
def passWord = System.getProperty("ps")
132+
pom.version = "$project.version"
133+
pom.artifactId = "$project.name"
134+
pom.groupId = "$project.group"
135+
repository(url: pom.version.endsWith('SNAPSHOT') ? 'https://oss.sonatype.org/content/repositories/snapshots/'
136+
:'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
137+
//noinspection GroovyAssignabilityCheck
138+
authentication(userName: userName, password: passWord)
139+
}
143140
}
144-
145-
pom.version = "$project.version"
146-
pom.artifactId = "$project.name"
147-
pom.groupId = "$project.group"
148141
pom.project {
149142
//noinspection GroovyAssignabilityCheck
150143
name 'mybatis-plus'

Diff for: buildSrc/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ apply plugin: "groovy"
44
https://github.com/gradle/gradle/issues/867
55
https://github.com/spring-gradle-plugins/propdeps-plugin/commit/bd14013e6f0adba7908778349bb0a08b50212658
66
*/
7+
8+
uploadArchives.enabled = false
9+
710
dependencies {
811
compile gradleApi()
912
compile localGroovy()

Diff for: gradle.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
signing.keyId=1FD337F9
22
signing.password=243194995
3-
signing.secretKeyRingFile=/Users/hubin/dev/signing.gpg
3+
signing.secretKeyRingFile=/Users/hubin/dev/signing.gpg
4+
local=true

0 commit comments

Comments
 (0)