Skip to content

Commit 6158146

Browse files
committed
Restore public publication
1 parent fb8b928 commit 6158146

File tree

7 files changed

+6
-95
lines changed

7 files changed

+6
-95
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ on:
44
types: [published]
55
jobs:
66
library:
7-
runs-on: [ self-hosted-org, linux ]
8-
container:
9-
image: docker://docker.tuenti.io/android/novum_android:13
7+
runs-on: [ ubuntu-latest ]
108
steps:
119
- name: Checkout repo
1210
uses: actions/checkout@v4
@@ -18,14 +16,10 @@ jobs:
1816
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEY }}
1917
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
2018
ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEYID }}
21-
NEXUS_USER: ${{ secrets.NEXUS_RELEASE_USER }}
22-
NEXUS_PASS: ${{ secrets.NEXUS_RELEASE_PASSWORD }}
2319
run: |
24-
./gradlew publishReleasePublicationToMavenRepository -DLIBRARY_VERSION=${{ github.event.release.tag_name }}
20+
./gradlew publishReleasePublicationToSonatypeRepository -DLIBRARY_VERSION=${{ github.event.release.tag_name }} --max-workers 1 closeAndReleaseStagingRepository
2521
plugin:
26-
runs-on: [ self-hosted-org, linux ]
27-
container:
28-
image: docker://docker.tuenti.io/android/novum_android:13
22+
runs-on: [ ubuntu-latest ]
2923
steps:
3024
- name: Checkout repo
3125
uses: actions/checkout@v4
@@ -34,8 +28,6 @@ jobs:
3428
env:
3529
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
3630
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
37-
NEXUS_USER: ${{ secrets.NEXUS_RELEASE_USER }}
38-
NEXUS_PASS: ${{ secrets.NEXUS_RELEASE_PASSWORD }}
3931
run: |
4032
cd include-build
41-
../gradlew publishGradlePluginPublicationToMavenRepository -DLIBRARY_VERSION=${{ github.event.release.tag_name }}
33+
../gradlew publishPlugins -DLIBRARY_VERSION=${{ github.event.release.tag_name }}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [yyyy] [name of copyright owner]
189+
Copyright [2025] [Telefónica]
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

include-build/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
alias(libs.plugins.kotlin.jvm) apply false
33
alias(libs.plugins.detekt)
4-
alias(libs.plugins.publish)
54
}
65

76
allprojects {
@@ -15,5 +14,3 @@ allprojects {
1514
buildUponDefaultConfig = true
1615
}
1716
}
18-
19-
apply("${rootProject.projectDir}/../publish_maven_central.gradle")

include-build/gradle-plugin/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,3 @@ gradlePlugin {
3131
}
3232
}
3333
}
34-
35-
apply("${rootProject.projectDir}/mavencentral.gradle")

include-build/gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ ddmlib = "31.4.1"
55
kotlin = "1.9.23"
66
detekt = "1.23.6"
77
publish-plugin = "1.2.0"
8-
publish = "1.1.0"
98

109
[libraries]
1110
android-builder-test-api = { module = "com.android.tools.build:builder-test-api", version.ref = "agp" }
@@ -17,4 +16,3 @@ android-gradle = { module = "com.android.tools.build:gradle", version.ref = "agp
1716
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
1817
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
1918
publish-plugin = { id = "com.gradle.plugin-publish", version.ref = "publish-plugin" }
20-
publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "publish" }

include-build/mavencentral.gradle

Lines changed: 0 additions & 64 deletions
This file was deleted.

mavencentral.gradle

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,6 @@ apply plugin: 'maven-publish'
1111
apply plugin: 'signing'
1212

1313
publishing {
14-
repositories {
15-
maven {
16-
credentials {
17-
username System.env.NEXUS_USER
18-
password System.env.NEXUS_PASS
19-
}
20-
def releasesRepoUrl = "https://nexusng.tuenti.io/repository/maven-release-private/"
21-
def snapshotsRepoUrl = "https://nexusng.tuenti.io/repository/maven-snapshot-private/"
22-
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
23-
}
24-
}
2514
publications {
2615
release(MavenPublication) {
2716
groupId 'com.telefonica'
@@ -70,6 +59,7 @@ publishing {
7059

7160
afterEvaluate {
7261
tasks.getByName("publishReleasePublicationToMavenLocal").dependsOn("assembleRelease")
62+
tasks.getByName("publishReleasePublicationToSonatypeRepository").dependsOn("assembleRelease")
7363
tasks.getByName("signReleasePublication").dependsOn("assembleRelease")
7464
}
7565

0 commit comments

Comments
 (0)