Skip to content

Commit 2485d06

Browse files
committed
Update to central portal
1 parent f88e649 commit 2485d06

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,20 @@ jobs:
2727
distribution: 'zulu'
2828
java-version: 17
2929

30+
- name: Setup Android
31+
uses: android-actions/setup-android@v3
32+
33+
- name: Install CMake 3.18.1
34+
run: yes | sdkmanager "cmake;3.18.1"
35+
3036
- name: Setup gradle
31-
uses: gradle/gradle-build-action@v2
37+
uses: gradle/actions/setup-gradle@v4
38+
3239
- name: Upload Artifacts
3340
run: cd ./android;./gradlew clean publish --stacktrace
3441
env:
35-
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
36-
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
42+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_PORTAL_USERNAME }}
43+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PORTAL_PASSWORD }}
3744
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }}
3845
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ARTIFACT_SIGNING_KEY_PASSWORD }}
3946
ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.ARTIFACT_SIGNING_KEY_ID }}

android-test/netguard/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'com.android.library'
33
id 'org.jetbrains.kotlin.android'
4-
id "com.vanniktech.maven.publish" version "0.23.1"
4+
id "com.vanniktech.maven.publish" version "0.33.0"
55
}
66

77
//apply plugin: 'maven-publish'
@@ -13,8 +13,8 @@ def getVersionName = { ->
1313
import com.vanniktech.maven.publish.SonatypeHost
1414

1515
mavenPublishing {
16-
// publishing to https://s01.oss.sonatype.org
17-
publishToMavenCentral(SonatypeHost.S01, true)
16+
// publishing to Central portal
17+
publishToMavenCentral()
1818

1919
signAllPublications()
2020

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id 'com.android.library' version '7.2.0' apply false
3+
id 'com.android.library' version '8.0.2' apply false
44
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
55
}
66

77
task clean(type: Delete) {
88
delete rootProject.buildDir
9-
}
9+
}

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
#Thu Dec 15 14:34:25 WET 2022
1818
distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
20-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
20+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
2121
zipStoreBase=GRADLE_USER_HOME
2222
zipStorePath=wrapper/dists

android/netguard/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'com.android.library'
33
id 'org.jetbrains.kotlin.android'
4-
id "com.vanniktech.maven.publish" version "0.23.1"
4+
id "com.vanniktech.maven.publish" version "0.33.0"
55
}
66

77
//apply plugin: 'maven-publish'
@@ -15,8 +15,8 @@ def getVersionName = { ->
1515
import com.vanniktech.maven.publish.SonatypeHost
1616

1717
mavenPublishing {
18-
// publishing to https://s01.oss.sonatype.org
19-
publishToMavenCentral(SonatypeHost.S01, true)
18+
// publishing to Central Portal
19+
publishToMavenCentral()
2020

2121
signAllPublications()
2222

@@ -50,6 +50,7 @@ mavenPublishing {
5050
}
5151

5252
android {
53+
namespace "com.duckduckgo.mobile.netguard"
5354
compileSdk 32
5455
ndkVersion "21.4.7075529"
5556

0 commit comments

Comments
 (0)