diff --git a/.gitignore b/.gitignore index 16988244f155ad5410bf30f7908819d6492dc14e..a00cc16074dcbe47747f5bcac7f019307b6bf19a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,12 @@ npm-debug.log # and https://gist.github.com/adamgit/3786883 ######################### +##### +# Android + +android/local.properties +android/*.iml + ##### # OS X temporary files that should never be committed diff --git a/README.md b/README.md index 078c9501302d310aa6148f594e2e11d29a7d11a4..c76c123706295f9090968d3f3d7fd105f28d3aa8 100644 --- a/README.md +++ b/README.md @@ -76,8 +76,8 @@ And the following methods to support registration and receiving notifications: Add a reference to the library's native code in your global `settings.gradle`: ``` -include ':react-native-notifications' -project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android') +include ':reactnativenotifications' +project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android') ``` Declare the library as a dependency in your **app-project's** `build.gradle`: @@ -86,7 +86,7 @@ Declare the library as a dependency in your **app-project's** `build.gradle`: dependencies { // ... - compile project(':react-native-notifications') + compile project(':reactnativenotifications') } ``` diff --git a/android/build.gradle b/android/build.gradle index 236cfe64a5c4f97edb953ae7c56295f8b455ac19..4e2b7cfccda11c42db61b8fd5c68b6489b6dfab5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 23 - buildToolsVersion "24.0.1" + buildToolsVersion "23.0.3" defaultConfig { minSdkVersion 16 @@ -19,8 +19,9 @@ android { } dependencies { - // Google's GCM related framework components. + // Google's GCM. compile "com.google.android.gms:play-services-gcm:9.4.0" + compile 'com.facebook.react:react-native:+' testCompile 'junit:junit:4.12' diff --git a/example/android/myapplication/build.gradle b/example/android/myapplication/build.gradle index f97a9e84157791dff72a4c9d1300cd6d15b8c025..e59a6b8f70b681f116d732227070f8700b56a602 100644 --- a/example/android/myapplication/build.gradle +++ b/example/android/myapplication/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "24.0.1" + buildToolsVersion "23.0.3" defaultConfig { applicationId "com.wix.reactnativenotifications.app" @@ -32,7 +32,6 @@ dependencies { compile 'com.android.support:appcompat-v7:23.4.0' compile 'com.android.support:design:23.4.0' compile 'com.facebook.react:react-native:+' - compile "com.google.android.gms:play-services-gcm:9+" compile project(':react-native-notifications') testCompile 'junit:junit:4.12'