Skip to content

Commit 8b3dc2a

Browse files
committed
Added maven secrets
1 parent 02e0c66 commit 8b3dc2a

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

.github/workflows/publish.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ jobs:
2525
env:
2626
bintrayUser: ${{ secrets.BINTRAY_USER }}
2727
bintrayApiKey: ${{ secrets.BINTRAY_API_KEY }}
28-
mavenCentralPwd: ${{ secrets.OSS_PASSWORD }}
28+
mavenUser: ${{ secrets.MAVEN_USER }}
29+
mavenToken: ${{ secrets.MAVEN_TOKEN }}
2930
run: ./gradlew bintrayUpload

deploy-bintray.gradle.kts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,22 @@ val siteUrl = properties["siteUrl"].toString()
2424
val gitUrl = properties["gitUrl"].toString()
2525

2626
configure<BintrayExtension> {
27-
var ossPwd = ""
27+
var ossUser = ""
28+
var ossToken = ""
2829
if (project.rootProject.file("local.properties").exists()) {
2930
val fis = FileInputStream(project.rootProject.file("local.properties"))
3031
val prop = Properties()
3132
prop.load(fis)
3233
user = prop.getProperty("bintray.user", "")
3334
key = prop.getProperty("bintray.apiKey", "")
34-
ossPwd = prop.getProperty("bintray.ossPwd", "")
35+
ossUser = prop.getProperty("bintray.ossUser", "")
36+
ossToken = prop.getProperty("bintray.ossToken", "")
3537
} else {
3638
user = System.getenv("bintrayUser")
3739
key = System.getenv("bintrayApiKey")
38-
ossPwd = System.getenv("mavenCentralPwd") ?: ""
40+
ossUser = System.getenv("mavenUser") ?: ""
41+
ossToken = System.getenv("mavenToken") ?: ""
42+
println("mavenUser"+System.getenv("mavenUser").isNullOrEmpty()+"mavenToken"+System.getenv("mavenToken").isNullOrEmpty())
3943
}
4044

4145
setPublications(bintrayRepo)
@@ -56,11 +60,11 @@ configure<BintrayExtension> {
5660
vcsTag = libraryVersion
5761
desc = libraryDescription
5862
released = Date().toString()
59-
if (ossPwd.isNotEmpty())
63+
if (ossToken.isNotEmpty())
6064
mavenCentralSync.apply {
6165
sync = true
62-
user = user
63-
password = ossPwd
66+
user = ossUser
67+
password = ossToken
6468
}
6569
}
6670
}
@@ -83,7 +87,7 @@ configure<PublishingExtension> {
8387
artifact(tasks.named("sourcesJar"))
8488
artifact(tasks.named("dokkaJar"))
8589
artifact("$buildDir/outputs/aar/${artifactId}-release.aar") {
86-
builtBy(tasks.getByName("assemble"))
90+
builtBy(tasks.getByName("assemble"))
8791
}
8892

8993
pom {

0 commit comments

Comments
 (0)