Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Commit 8952eac

Browse files
authored
Move from JCenter to Maven Central (#323)
1 parent 5da4f24 commit 8952eac

10 files changed

+151
-186
lines changed

Diff for: PUBLISHING.md

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
## Publishing
2+
3+
### Credentials
4+
5+
The library is published to Maven Central by the firebase-sonatype account, Googlers can find the
6+
password for this account in [Valentine](http://valentine/)
7+
8+
### GPG Key
9+
10+
You will need to create a private GPG keyring on your machine, if you don't have one do the
11+
following steps:
12+
13+
1. Run `gpg --full-generate-key`
14+
1. Choose `RSA and RSA` for the key type
15+
1. Use `4096` for the key size
16+
1. Use `0` for the expiration (never)
17+
1. Use any name, email address, and password
18+
19+
This creates your key in `~/.gnupg/openpgp-revocs.d/` with `.rev` format. The last 8 characters
20+
before the `.rev` extension are your **Key ID**.
21+
22+
To export the key, run:
23+
24+
```
25+
gpg --export-secret-keys -o $HOME/sonatype.gpg
26+
```
27+
28+
Finally upload your key to the keyserver:
29+
30+
```
31+
gpg --keyserver hkp://keys.openpgp.org --send-keys <YOUR KEY ID>
32+
```
33+
34+
### Local Properties
35+
36+
Open your `$HOME/.gradle/gradle.properties` file at and fill in the values:
37+
38+
```
39+
signing.keyId=<KEY ID>
40+
signing.password=<PASSWORD YOU CHOSE>
41+
signing.secretKeyRingFile=<FULL PATH TO YOUR GPG FILE>
42+
mavenCentralRepositoryUsername=firebase-sonatype
43+
mavenCentralRepositoryUsername=<PASSWORD FROM VALENTINE>
44+
```
45+
46+
### Publish
47+
48+
To publish, run:
49+
50+
```
51+
./gradlew publish
52+
```
53+
54+
### Release
55+
56+
Follow [the instructions here](https://central.sonatype.org/pages/releasing-the-deployment.html):
57+
58+
1. Navigate to https://s01.oss.sonatype.org/ and **Log In**
59+
1. On the left side click **Build Promotion** and look for the `com.firebase` repo
60+
1. Click **Close** ... wait a few minutes (you can check status with **Refresh**)
61+
1. Click **Release**

Diff for: app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion compileSdk
4+
compileSdkVersion 30
55
testOptions.unitTests.includeAndroidResources = true
66

77
defaultConfig {
88
applicationId "pub.devrel.easypermissions.sample"
99
minSdkVersion 14
10-
targetSdkVersion targetSdk
10+
targetSdkVersion 30
1111
versionCode 1
1212
versionName "1.0"
1313
}

Diff for: build.gradle

+1-17
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77

88
dependencies {
99
classpath 'com.android.tools.build:gradle:4.0.0'
10-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
10+
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2'
1111
classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
1212
}
1313
}
@@ -22,19 +22,3 @@ allprojects {
2222
task clean(type: Delete) {
2323
delete rootProject.buildDir
2424
}
25-
26-
ext {
27-
projectName = 'EasyPermissions'
28-
projectDesc = 'A wrapper library for basic Android M system permissions logic'
29-
30-
githubUrl = 'https://github.com/googlesamples/easypermissions'
31-
32-
mavenGroup = 'pub.devrel'
33-
mavenArtifactId = 'easypermissions'
34-
mavenVersion = '3.0.0'
35-
36-
bintrayOrg = 'easygoogle'
37-
38-
compileSdk = 30
39-
targetSdk = 30
40-
}

Diff for: easypermissions/bintray.gradle

-121
This file was deleted.

Diff for: easypermissions/build.gradle

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
apply plugin: 'com.android.library'
22
apply plugin: "com.vanniktech.android.junit.jacoco"
33

4+
// See: https://github.com/vanniktech/gradle-maven-publish-plugin/issues/206
5+
ext {
6+
RELEASE_REPOSITORY_URL = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
7+
SNAPSHOT_REPOSITORY_URL = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
8+
}
9+
10+
apply plugin: 'com.vanniktech.maven.publish'
11+
412
android {
5-
compileSdkVersion compileSdk
13+
compileSdkVersion 30
614
testOptions.unitTests.includeAndroidResources = true
715

816
defaultConfig {
917
minSdkVersion 14
10-
targetSdkVersion targetSdk
18+
targetSdkVersion 30
1119
versionCode 1
12-
versionName mavenVersion
20+
versionName "3.0.0"
1321
}
1422

1523
buildTypes {
@@ -47,5 +55,3 @@ dependencies {
4755
testImplementation 'androidx.fragment:fragment-testing:1.2.5'
4856
testImplementation 'org.mockito:mockito-core:2.23.4'
4957
}
50-
51-
apply from: 'bintray.gradle'

Diff for: easypermissions/gradle.properties

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
GROUP=pub.devrel
2+
POM_ARTIFACT_ID=easypermissions
3+
VERSION_NAME=3.0.0
4+
5+
POM_NAME=EasyPermissions
6+
POM_PACKAGING=aar
7+
8+
POM_DESCRIPTION=A wrapper library for basic Android M system permissions logic
9+
10+
POM_URL=https://github.com/googlesamples/easypermissions
11+
POM_SCM_URL=https://github.com/googlesamples/easypermissions
12+
POM_SCM_CONNECTION=https://github.com/googlesamples/easypermissions.git
13+
14+
POM_LICENCE_NAME=The Apache Software License, Version 2.0
15+
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
16+
POM_LICENCE_DIST=repo
17+
18+
POM_DEVELOPER_NAME=Google

Diff for: gradle/wrapper/gradle-wrapper.jar

3.92 KB
Binary file not shown.

Diff for: gradle/wrapper/gradle-wrapper.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Tue Jul 07 16:12:58 CST 2020
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

Diff for: gradlew

+33-20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
319
##############################################################################
420
##
521
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
2844
APP_BASE_NAME=`basename "$0"`
2945

3046
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS='"-Xmx64m"'
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
3248

3349
# Use the maximum available, or set MAX_FD != -1 to use that value.
3450
MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
6682

6783
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6884

85+
6986
# Determine the Java command to use to start the JVM.
7087
if [ -n "$JAVA_HOME" ] ; then
7188
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
109126
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110127
fi
111128

112-
# For Cygwin, switch paths to Windows format before running java
113-
if $cygwin ; then
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
114131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
116134
JAVACMD=`cygpath --unix "$JAVACMD"`
117135

118136
# We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
138156
else
139157
eval `echo args$i`="\"$arg\""
140158
fi
141-
i=$((i+1))
159+
i=`expr $i + 1`
142160
done
143161
case $i in
144-
(0) set -- ;;
145-
(1) set -- "$args0" ;;
146-
(2) set -- "$args0" "$args1" ;;
147-
(3) set -- "$args0" "$args1" "$args2" ;;
148-
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149-
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150-
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151-
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152-
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153-
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154172
esac
155173
fi
156174

@@ -159,14 +177,9 @@ save () {
159177
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160178
echo " "
161179
}
162-
APP_ARGS=$(save "$@")
180+
APP_ARGS=`save "$@"`
163181

164182
# Collect all arguments for the java command, following the shell quoting and substitution rules
165183
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166184

167-
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168-
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169-
cd "$(dirname "$0")"
170-
fi
171-
172185
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)