Skip to content

Commit cc047f6

Browse files
committed
Merge branch 'master' into save-eventually-issue
* master: Match up all docs with artifact names (parse-community#836) publish fcm / gcm on their subpath (parse-community#835)
2 parents 65934bf + eea6dd4 commit cc047f6

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

fcm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Add dependency to the application level `build.gradle` file.
1010
```groovy
1111
dependencies {
1212
implementation 'com.parse:parse-android:latest.version.here'
13-
implementation 'com.parse:parse-android-fcm:latest.version.here'
13+
implementation 'com.parse:parse-fcm-android:latest.version.here'
1414
}
1515
```
1616
Then, follow Google's docs for [setting up an Firebase app](https://firebase.google.com/docs/android/setup). Although the steps are different for setting up FCM with Parse, it is also a good idea to read over the [Firebase FCM Setup](https://firebase.google.com/docs/cloud-messaging/android/client).

gcm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Add dependency to the application level `build.gradle` file.
1313
```groovy
1414
dependencies {
1515
implementation 'com.parse:parse-android:latest.version.here'
16-
implementation 'com.parse:parse-android-gcm:latest.version.here'
16+
implementation 'com.parse:parse-gcm-android:latest.version.here'
1717
}
1818
```
1919
You will then need to register some things in your manifest, firstly, the GCM sender ID:

gcm/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ group = 'com.parse'
55

66
ext {
77
projDescription = 'Parse Android GCM support.'
8-
artifact = 'parse-android-gcm'
8+
artifact = 'parse-gcm-android'
99
projName = 'Parse-Android'
1010
gitLink = 'https://github.com/parse-community/Parse-SDK-Android'
1111
}

gradle/gradle-mvn-push.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ android.libraryVariants.all { variant ->
55

66
def javadoc = task("javadoc${variant.name.capitalize()}", type: Javadoc) {
77
description "Generates Javadoc for $variant.name."
8-
destinationDir = rootProject.file("docs/api")
8+
def path = ("$project.name" == "Parse") ? "" : "$project.name"
9+
destinationDir = rootProject.file("docs/api/$path")
910
source = variant.javaCompiler.source
1011
ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
1112
doFirst {

0 commit comments

Comments
 (0)