Skip to content

Commit 0395ed2

Browse files
committed
fix(packages/android): update Gradle publish command secrets and variables usage
1 parent c2ca2b4 commit 0395ed2

File tree

3 files changed

+19
-23
lines changed

3 files changed

+19
-23
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,7 @@ jobs:
260260

261261
- name: release android aar to maven central
262262
if: steps.tag.outputs.version != ''
263-
run: cd packages/android && ./gradlew publishToCentralPortal -PVERSION=${{ steps.tag.outputs.version }}
264-
env:
265-
SONATYPE_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
266-
SONATYPE_PASSWORD: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
267-
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
268-
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
263+
run: make aar && cd packages/android && ./gradlew publishAggregationToCentralPortal -PSIGNING_KEY="${{ secrets.SIGNING_KEY }}" -PSIGNING_PASSWORD="${{ secrets.SIGNING_PASSWORD }}" -PSONATYPE_USERNAME="${{ secrets.MAVEN_CENTRAL_USERNAME }}" -PSONATYPE_PASSWORD="${{ secrets.MAVEN_CENTRAL_TOKEN }}" -PVERSION="${{ steps.tag.outputs.version }}"
269264

270265
- uses: softprops/action-gh-release@v2.2.1
271266
if: steps.tag.outputs.version != ''

packages/android/build.gradle

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
plugins {
12-
id 'com.gradleup.nmcp' version '1.2.0'
12+
id 'com.gradleup.nmcp.aggregation' version '1.2.0'
1313
}
1414

1515
apply plugin: 'com.android.library'
@@ -60,7 +60,7 @@ afterEvaluate {
6060
artifactId = 'vector'
6161
version = project.hasProperty('VERSION') ? project.VERSION : ['make', 'version'].execute(null, file('../..')).text.trim()
6262

63-
artifact tasks.named("bundleReleaseAar").get().outputs.files.singleFile
63+
artifact("$buildDir/outputs/aar/android-release.aar")
6464

6565
// Maven Central metadata
6666
pom {
@@ -94,27 +94,28 @@ afterEvaluate {
9494
}
9595
}
9696
}
97-
}
9897

99-
// Signing configuration for Maven Central
100-
signing {
101-
required { project.hasProperty("SIGNING_KEY") }
102-
if (project.hasProperty("SIGNING_KEY")) {
103-
useInMemoryPgpKeys(
104-
project.property("SIGNING_KEY").toString(),
105-
project.property("SIGNING_PASSWORD").toString()
106-
)
107-
sign publishing.publications.release
98+
// Signing configuration for Maven Central
99+
signing {
100+
required { project.hasProperty("SIGNING_KEY") }
101+
if (project.hasProperty("SIGNING_KEY")) {
102+
useInMemoryPgpKeys(
103+
project.property("SIGNING_KEY").toString(),
104+
project.property("SIGNING_PASSWORD").toString()
105+
)
106+
sign publishing.publications.release
107+
}
108108
}
109109
}
110110

111-
// Maven Central publishing via NMCP
112-
nmcp {
111+
// Maven Central publishing via NMCP aggregation
112+
nmcpAggregation {
113113
if (project.hasProperty("SONATYPE_USERNAME") && project.hasProperty("SONATYPE_PASSWORD")) {
114-
publishAllPublications {
114+
centralPortal {
115115
username = project.property("SONATYPE_USERNAME")
116116
password = project.property("SONATYPE_PASSWORD")
117-
publicationType = "AUTOMATIC"
117+
publishingType = "AUTOMATIC"
118118
}
119+
publishAllProjectsProbablyBreakingProjectIsolation()
119120
}
120121
}

src/sqlite-vector.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
extern "C" {
2525
#endif
2626

27-
#define SQLITE_VECTOR_VERSION "0.9.29"
27+
#define SQLITE_VECTOR_VERSION "0.9.32"
2828

2929
SQLITE_VECTOR_API int sqlite3_vector_init (sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi);
3030

0 commit comments

Comments
 (0)