From 962e297048380580ac33e1225ebaee44f22ca87a Mon Sep 17 00:00:00 2001 From: renato Date: Wed, 12 Oct 2016 16:31:50 -0300 Subject: [PATCH] Fixed package name for Android --- Examples/simple-fcm-client/android/app/BUCK | 4 ++-- Examples/simple-fcm-client/android/app/build.gradle | 2 +- .../android/app/src/main/AndroidManifest.xml | 2 +- .../main/java/{com => fcm}/simplefcmclient/MainActivity.java | 2 +- .../java/{com => fcm}/simplefcmclient/MainApplication.java | 2 +- Examples/simple-fcm-client/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename Examples/simple-fcm-client/android/app/src/main/java/{com => fcm}/simplefcmclient/MainActivity.java (92%) rename Examples/simple-fcm-client/android/app/src/main/java/{com => fcm}/simplefcmclient/MainApplication.java (97%) diff --git a/Examples/simple-fcm-client/android/app/BUCK b/Examples/simple-fcm-client/android/app/BUCK index 5faabf4..432221e 100644 --- a/Examples/simple-fcm-client/android/app/BUCK +++ b/Examples/simple-fcm-client/android/app/BUCK @@ -46,13 +46,13 @@ android_library( android_build_config( name = 'build_config', - package = 'com.simplefcmclient', + package = 'fcm.simplefcmclient', ) android_resource( name = 'res', res = 'src/main/res', - package = 'com.simplefcmclient', + package = 'fcm.simplefcmclient', ) android_binary( diff --git a/Examples/simple-fcm-client/android/app/build.gradle b/Examples/simple-fcm-client/android/app/build.gradle index 960c44f..2f33331 100644 --- a/Examples/simple-fcm-client/android/app/build.gradle +++ b/Examples/simple-fcm-client/android/app/build.gradle @@ -88,7 +88,7 @@ android { buildToolsVersion "23.0.1" defaultConfig { - applicationId "com.simplefcmclient" + applicationId "fcm.simplefcmclient" minSdkVersion 16 targetSdkVersion 22 versionCode 1 diff --git a/Examples/simple-fcm-client/android/app/src/main/AndroidManifest.xml b/Examples/simple-fcm-client/android/app/src/main/AndroidManifest.xml index 91120c1..c4b6721 100644 --- a/Examples/simple-fcm-client/android/app/src/main/AndroidManifest.xml +++ b/Examples/simple-fcm-client/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ diff --git a/Examples/simple-fcm-client/android/app/src/main/java/com/simplefcmclient/MainActivity.java b/Examples/simple-fcm-client/android/app/src/main/java/fcm/simplefcmclient/MainActivity.java similarity index 92% rename from Examples/simple-fcm-client/android/app/src/main/java/com/simplefcmclient/MainActivity.java rename to Examples/simple-fcm-client/android/app/src/main/java/fcm/simplefcmclient/MainActivity.java index c5c7685..5343afa 100644 --- a/Examples/simple-fcm-client/android/app/src/main/java/com/simplefcmclient/MainActivity.java +++ b/Examples/simple-fcm-client/android/app/src/main/java/fcm/simplefcmclient/MainActivity.java @@ -1,4 +1,4 @@ -package com.simplefcmclient; +package fcm.simplefcmclient; import com.facebook.react.ReactActivity; diff --git a/Examples/simple-fcm-client/android/app/src/main/java/com/simplefcmclient/MainApplication.java b/Examples/simple-fcm-client/android/app/src/main/java/fcm/simplefcmclient/MainApplication.java similarity index 97% rename from Examples/simple-fcm-client/android/app/src/main/java/com/simplefcmclient/MainApplication.java rename to Examples/simple-fcm-client/android/app/src/main/java/fcm/simplefcmclient/MainApplication.java index 3c58df7..47e7069 100644 --- a/Examples/simple-fcm-client/android/app/src/main/java/com/simplefcmclient/MainApplication.java +++ b/Examples/simple-fcm-client/android/app/src/main/java/fcm/simplefcmclient/MainApplication.java @@ -1,4 +1,4 @@ -package com.simplefcmclient; +package fcm.simplefcmclient; import android.app.Application; import android.util.Log; diff --git a/Examples/simple-fcm-client/android/build.gradle b/Examples/simple-fcm-client/android/build.gradle index 5300173..a0639bb 100644 --- a/Examples/simple-fcm-client/android/build.gradle +++ b/Examples/simple-fcm-client/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:2.0.0' - classpath 'com.google.gms.google-services:3.0.0' + classpath 'com.google.gms:google-services:3.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/Examples/simple-fcm-client/android/gradle/wrapper/gradle-wrapper.properties b/Examples/simple-fcm-client/android/gradle/wrapper/gradle-wrapper.properties index b9fbfab..9851e51 100644 --- a/Examples/simple-fcm-client/android/gradle/wrapper/gradle-wrapper.properties +++ b/Examples/simple-fcm-client/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip -- 2.26.2