Skip to content

Commit 5d3cd09

Browse files
atsushienoatsushieno
committed
Revert "attempt to switch to nexus-publisher with CI setup changes."
This reverts commit 5a4b708.
1 parent 3d6ff65 commit 5d3cd09

File tree

15 files changed

+69
-177
lines changed

15 files changed

+69
-177
lines changed

.github/workflows/build.yml renamed to .github/workflows/actions.yml

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
name: build
1+
name: build dist
22

33
on:
44
push:
55
pull_request:
6-
workflow_call:
76

87
jobs:
98
linux-build:
109
name: build on linux
1110
runs-on: ubuntu-24.04
1211
steps:
1312
- name: checkout
14-
uses: actions/checkout@v4
13+
uses: actions/checkout@v1
1514
with:
1615
submodules: recursive
1716
- name: apt update
@@ -22,6 +21,19 @@ jobs:
2221
with:
2322
java-version: 17
2423
distribution: temurin
24+
# ONLY FOR NEW RELEASE TAGS
25+
- name: setup gpg necessities
26+
if: startsWith(github.ref, 'refs/tags/')
27+
run: sudo bash -c "echo '$GPG_KEY_CONTENTS' | base64 -d > $WORKSPACE/'$SIGNING_SECRET_KEY_RING_FILE'"
28+
env:
29+
WORKSPACE: ${{ github.workspace }}
30+
GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
31+
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
32+
# ONLY FOR NEW RELEASE TAGS
33+
- name: rewrite publish-pom.gradle to require signing
34+
if: startsWith(github.ref, 'refs/tags/')
35+
run: |
36+
sed -i "s/signing {}/signing { sign(publishing.publications) }/" publish-pom.gradle
2537
- name: cache AVD
2638
uses: actions/cache@v4
2739
env:
@@ -39,8 +51,20 @@ jobs:
3951
- name: apt install
4052
run: |
4153
echo y | sudo apt-get install doxygen libxml2-dev libgrpc++-dev libgrpc-dev libprotobuf-dev protobuf-compiler protobuf-compiler-grpc graphviz cmake ninja-build
54+
# ONLY FOR NON-RELEASES
4255
- name: build
56+
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
4357
run: ./gradlew build dokkaHtml publishToMavenLocal
58+
# ONLY FOR NEW RELEASE TAGS
59+
- name: publish
60+
if: startsWith(github.ref, 'refs/tags/')
61+
run: ./gradlew --warning-mode all publish dokkaHtml
62+
env:
63+
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
64+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
65+
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
66+
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
67+
SIGNING_SECRET_KEY_RING_FILE: ${{ format('{0}/{1}', github.workspace, secrets.SIGNING_SECRET_KEY_RING_FILE) }}
4468
- name: run instrumented tests (disabled)
4569
if: false
4670
# > Gradle was not able to complete device setup for: dev30_google_x86_Pixel_5
@@ -57,6 +81,19 @@ jobs:
5781
path: |
5882
./*/build/outputs/aar/*.aar
5983
samples/*/build/outputs/apk/debug/*.apk
84+
# Create release, only for release tags
85+
- name: Create Release
86+
uses: ncipollo/release-action@v1
87+
if: success() && startsWith(github.ref, 'refs/tags/')
88+
with:
89+
artifacts: ./*/build/outputs/aar/*.aar,samples/*/build/outputs/apk/debug/*.apk
90+
# Update API reference, only for release tags
91+
- name: deploy to GitHub Pages
92+
if: ${{ success() && startsWith(github.ref, 'refs/tags/') }}
93+
uses: JamesIves/github-pages-deploy-action@v4
94+
with:
95+
branch: gh-pages
96+
folder: androidaudioplugin/build/dokka/html
6097

6198
osx-build:
6299
name: build on osx
@@ -67,7 +104,7 @@ jobs:
67104
with:
68105
submodules: recursive
69106
- name: set up JDK 17
70-
uses: actions/setup-java@v4
107+
uses: actions/setup-java@v3
71108
with:
72109
java-version: 17
73110
distribution: temurin

‎.github/workflows/deploy.yml‎

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

‎androidaudioplugin-manager/build.gradle.kts‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
2-
31
plugins {
4-
alias(libs.plugins.android.library)
5-
alias(libs.plugins.kotlin.android)
6-
alias(libs.plugins.dokka)
7-
alias(libs.plugins.vanniktech.maven.publish)
2+
id ("com.android.library")
3+
id ("kotlin-android")
4+
id ("org.jetbrains.dokka")
85
id ("maven-publish")
96
id ("signing")
107
}
@@ -64,14 +61,6 @@ android {
6461
}
6562

6663
apply { from ("../publish-pom.gradle") }
67-
// "mavenPublishing" could not resolve reference to com.vanniktech.maven.publish.SonatypeHost. Another reason Gradle should die.
68-
mavenPublishing {
69-
configure(AndroidMultiVariantLibrary())
70-
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
71-
if (project.hasProperty("mavenCentralUsername") ||
72-
System.getenv("ORG_GRADLE_PROJECT_mavenCentralUsername") != null)
73-
signAllPublications()
74-
}
7564

7665
dependencies {
7766
implementation (project(":androidaudioplugin"))

‎androidaudioplugin-midi-device-service/build.gradle.kts‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
2-
31
plugins {
4-
alias(libs.plugins.android.library)
5-
alias(libs.plugins.kotlin.android)
6-
alias(libs.plugins.dokka)
7-
alias(libs.plugins.vanniktech.maven.publish)
2+
id ("com.android.library")
3+
id ("kotlin-android")
4+
id ("org.jetbrains.dokka")
85
id ("maven-publish")
96
id ("signing")
107
}
@@ -64,14 +61,6 @@ android {
6461
}
6562

6663
apply { from ("../publish-pom.gradle") }
67-
// "mavenPublishing" could not resolve reference to com.vanniktech.maven.publish.SonatypeHost. Another reason Gradle should die.
68-
mavenPublishing {
69-
configure(AndroidMultiVariantLibrary())
70-
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
71-
if (project.hasProperty("mavenCentralUsername") ||
72-
System.getenv("ORG_GRADLE_PROJECT_mavenCentralUsername") != null)
73-
signAllPublications()
74-
}
7564

7665
dependencies {
7766
implementation (project(":androidaudioplugin"))

‎androidaudioplugin-testing/build.gradle.kts‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
2-
31
plugins {
4-
alias(libs.plugins.android.library)
5-
alias(libs.plugins.kotlin.android)
6-
alias(libs.plugins.dokka)
7-
alias(libs.plugins.vanniktech.maven.publish)
2+
id ("com.android.library")
3+
id ("kotlin-android")
4+
id ("org.jetbrains.dokka")
85
id ("maven-publish")
96
id ("signing")
107
}
@@ -24,14 +21,6 @@ android {
2421
}
2522

2623
apply { from ("../publish-pom.gradle") }
27-
// "mavenPublishing" could not resolve reference to com.vanniktech.maven.publish.SonatypeHost. Another reason Gradle should die.
28-
mavenPublishing {
29-
configure(AndroidMultiVariantLibrary())
30-
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
31-
if (project.hasProperty("mavenCentralUsername") ||
32-
System.getenv("ORG_GRADLE_PROJECT_mavenCentralUsername") != null)
33-
signAllPublications()
34-
}
3524

3625
dependencies {
3726
implementation (project(":androidaudioplugin"))

‎androidaudioplugin-ui-compose-app/build.gradle.kts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
2-
31
plugins {
42
alias(libs.plugins.android.library)
53
alias(libs.plugins.kotlin.android)
64
alias(libs.plugins.compose.compiler)
75
alias(libs.plugins.dokka)
8-
alias(libs.plugins.vanniktech.maven.publish)
96
id ("maven-publish")
107
id ("signing")
118
}
@@ -45,14 +42,6 @@ android {
4542
}
4643

4744
apply { from ("../publish-pom.gradle") }
48-
// "mavenPublishing" could not resolve reference to com.vanniktech.maven.publish.SonatypeHost. Another reason Gradle should die.
49-
mavenPublishing {
50-
configure(AndroidMultiVariantLibrary())
51-
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
52-
if (project.hasProperty("mavenCentralUsername") ||
53-
System.getenv("ORG_GRADLE_PROJECT_mavenCentralUsername") != null)
54-
signAllPublications()
55-
}
5645

5746
dependencies {
5847
implementation (project(":androidaudioplugin"))

‎androidaudioplugin-ui-compose/build.gradle.kts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
2-
31
plugins {
42
alias(libs.plugins.android.library)
53
alias(libs.plugins.kotlin.android)
64
alias(libs.plugins.compose.compiler)
75
alias(libs.plugins.dokka)
8-
alias(libs.plugins.vanniktech.maven.publish)
96
id ("maven-publish")
107
id ("signing")
118
}
@@ -45,14 +42,6 @@ android {
4542
}
4643

4744
apply { from ("../publish-pom.gradle") }
48-
// "mavenPublishing" could not resolve reference to com.vanniktech.maven.publish.SonatypeHost. Another reason Gradle should die.
49-
mavenPublishing {
50-
configure(AndroidMultiVariantLibrary())
51-
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
52-
if (project.hasProperty("mavenCentralUsername") ||
53-
System.getenv("ORG_GRADLE_PROJECT_mavenCentralUsername") != null)
54-
signAllPublications()
55-
}
5645

5746
dependencies {
5847
implementation (project(":androidaudioplugin"))

‎androidaudioplugin-ui-web/build.gradle.kts‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
2-
31
plugins {
4-
alias(libs.plugins.android.library)
5-
alias(libs.plugins.kotlin.android)
6-
alias(libs.plugins.dokka)
7-
alias(libs.plugins.vanniktech.maven.publish)
2+
id ("com.android.library")
3+
id ("kotlin-android")
4+
id ("org.jetbrains.dokka")
85
id ("maven-publish")
96
id ("signing")
107
}
@@ -24,14 +21,6 @@ android {
2421
}
2522

2623
apply { from ("../publish-pom.gradle") }
27-
// "mavenPublishing" could not resolve reference to com.vanniktech.maven.publish.SonatypeHost. Another reason Gradle should die.
28-
mavenPublishing {
29-
configure(AndroidMultiVariantLibrary())
30-
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
31-
if (project.hasProperty("mavenCentralUsername") ||
32-
System.getenv("ORG_GRADLE_PROJECT_mavenCentralUsername") != null)
33-
signAllPublications()
34-
}
3524

3625
dependencies {
3726
implementation (project(":androidaudioplugin"))

‎androidaudioplugin/build.gradle.kts‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import com.vanniktech.maven.publish.AndroidMultiVariantLibrary
2-
31
plugins {
42
alias(libs.plugins.android.library)
53
alias(libs.plugins.kotlin.android)
64
alias(libs.plugins.dokka)
7-
alias(libs.plugins.vanniktech.maven.publish)
5+
id ("maven-publish")
86
id ("signing")
97
}
108

@@ -69,14 +67,6 @@ android {
6967
}
7068

7169
apply { from ("../publish-pom.gradle") }
72-
// "mavenPublishing" could not resolve reference to com.vanniktech.maven.publish.SonatypeHost. Another reason Gradle should die.
73-
mavenPublishing {
74-
configure(AndroidMultiVariantLibrary())
75-
publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
76-
if (project.hasProperty("mavenCentralUsername") ||
77-
System.getenv("ORG_GRADLE_PROJECT_mavenCentralUsername") != null)
78-
signAllPublications()
79-
}
8070

8171
dependencies {
8272
implementation (libs.androidx.core.ktx)

‎build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ plugins {
55
alias(libs.plugins.kotlin.android) apply false
66
alias(libs.plugins.compose.compiler) apply false
77
alias(libs.plugins.dokka) apply false
8-
alias(libs.plugins.vanniktech.maven.publish).apply(false)
98
}
109

1110
buildscript {

0 commit comments

Comments
 (0)