From 41a8dfe4fb91dae7f0c913aa794ecb9c6cb54c78 Mon Sep 17 00:00:00 2001 From: Sergey Polshcha Date: Mon, 18 Feb 2019 14:59:28 +0700 Subject: [PATCH] [artefact][PUSH-17909] implementatin instead of compile --- .gitignore | 56 +++++++++++++++++++++++- src/android/build.gradle | 38 ++++++++-------- src/android/src/main/AndroidManifest.xml | 3 +- 3 files changed, 74 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 895decd..9392a22 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,55 @@ -src/ios/PushwooshPlugin.xcodeproj/xcuserdata +# OSX +# +.DS_Store + +# Xcode +# +build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata +*.xccheckout +*.moved-aside +DerivedData +*.hmap +*.ipa +*.xcuserstate project.xcworkspace -src/ios/build + +# Android/IntelliJ +# +build/ +.idea +.gradle +local.properties +*.iml + +# node.js +# +node_modules/ +npm-debug.log +yarn-error.log + +# BUCK +buck-out/ +\.buckd/ +android/app/libs +*.keystore + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +package-lock.json diff --git a/src/android/build.gradle b/src/android/build.gradle index 886e852..37ccd0a 100644 --- a/src/android/build.gradle +++ b/src/android/build.gradle @@ -39,24 +39,24 @@ ext { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.facebook.react:react-native:+' - compile "com.pushwoosh:pushwoosh:${pushwoosh}" - compile "com.pushwoosh:pushwoosh-amazon:${pushwoosh}" - compile "com.pushwoosh:pushwoosh-badge:${pushwoosh}" - compile "com.pushwoosh:pushwoosh-gcm:${pushwoosh}" - compile "com.pushwoosh:pushwoosh-inbox:${pushwoosh}" - compile "com.pushwoosh:pushwoosh-inbox-ui:${pushwoosh}" - compile "com.android.support:appcompat-v7:27.+" - compile "com.android.support:recyclerview-v7:27.+" - compile "com.android.support:recyclerview-v7:27.+" - compile "com.android.support:design:27.+" - compile "com.android.support.constraint:constraint-layout:1.0.2" - compile "com.github.bumptech.glide:glide:4.3.1" - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.60" - compile "com.google.android.gms:play-services-gcm:+" - compile "com.google.android.gms:play-services-location:+" - compile "com.google.firebase:firebase-core:+" - compile "com.google.firebase:firebase-messaging:+" + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.facebook.react:react-native:+' + implementation "com.pushwoosh:pushwoosh:${pushwoosh}" + implementation "com.pushwoosh:pushwoosh-amazon:${pushwoosh}" + implementation "com.pushwoosh:pushwoosh-badge:${pushwoosh}" + implementation "com.pushwoosh:pushwoosh-gcm:${pushwoosh}" + implementation "com.pushwoosh:pushwoosh-inbox:${pushwoosh}" + implementation "com.pushwoosh:pushwoosh-inbox-ui:${pushwoosh}" + implementation "com.android.support:appcompat-v7:27.+" + implementation "com.android.support:recyclerview-v7:27.+" + implementation "com.android.support:recyclerview-v7:27.+" + implementation "com.android.support:design:27.+" + implementation "com.android.support.constraint:constraint-layout:1.0.2" + implementation "com.github.bumptech.glide:glide:4.3.1" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.60" + implementation "com.google.android.gms:play-services-gcm:+" + implementation "com.google.android.gms:play-services-location:+" + implementation "com.google.firebase:firebase-core:+" + implementation "com.google.firebase:firebase-messaging:+" } diff --git a/src/android/src/main/AndroidManifest.xml b/src/android/src/main/AndroidManifest.xml index 8e116f9..c32c091 100644 --- a/src/android/src/main/AndroidManifest.xml +++ b/src/android/src/main/AndroidManifest.xml @@ -14,8 +14,7 @@ - +