From d3caaba27d4b9f9bfeb0567c2476bea1767c7a77 Mon Sep 17 00:00:00 2001 From: Pham Ngoc Thach Date: Thu, 14 May 2020 13:21:50 +0700 Subject: [PATCH 1/3] Add gitignore --- .gitignore | 103 +++++++ android/.idea/codeStyles/Project.xml | 116 -------- android/.idea/gradle.xml | 13 - android/.idea/misc.xml | 17 -- android/.idea/modules.xml | 8 - android/.idea/runConfigurations.xml | 12 - android/.idea/workspace.xml | 275 ------------------ .../reactlibrary/.idea/codeStyles/Project.xml | 116 -------- .../java/com/reactlibrary/.idea/modules.xml | 8 - .../com/reactlibrary/.idea/reactlibrary.iml | 9 - .../java/com/reactlibrary/.idea/workspace.xml | 187 ------------ 11 files changed, 103 insertions(+), 761 deletions(-) create mode 100644 .gitignore delete mode 100644 android/.idea/codeStyles/Project.xml delete mode 100644 android/.idea/gradle.xml delete mode 100644 android/.idea/misc.xml delete mode 100644 android/.idea/modules.xml delete mode 100644 android/.idea/runConfigurations.xml delete mode 100644 android/.idea/workspace.xml delete mode 100644 android/src/main/java/com/reactlibrary/.idea/codeStyles/Project.xml delete mode 100644 android/src/main/java/com/reactlibrary/.idea/modules.xml delete mode 100644 android/src/main/java/com/reactlibrary/.idea/reactlibrary.iml delete mode 100644 android/src/main/java/com/reactlibrary/.idea/workspace.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3642352 --- /dev/null +++ b/.gitignore @@ -0,0 +1,103 @@ +# 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 + +# Android/IntelliJ +# +build/ +.idea +.gradle +local.properties +*.iml + +# node.js +# +node_modules/ +npm-debug.log +yarn-error.log + +# BUCK +buck-out/ +\.buckd/ +*.keystore +!debug.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://docs.fastlane.tools/best-practices/source-control/ + +*/fastlane/report.xml +*/fastlane/Preview.html +*/fastlane/screenshots + +# Bundle artifact +*.jsbundle + +# CocoaPods +/ios/Pods/ + +# VSCode +.vscode/.react/ + + +# Created by https://www.gitignore.io/api/xcode +# Edit at https://www.gitignore.io/?templates=xcode + +### Xcode ### +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## User settings +xcuserdata/ + +## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) +*.xcscmblueprint +*.xccheckout + +## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) +build/ +DerivedData/ +*.moved-aside +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 + +## Xcode Patch +*.xcodeproj/* +!*.xcodeproj/project.pbxproj +!*.xcodeproj/xcshareddata/ +!*.xcworkspace/contents.xcworkspacedata +/*.gcno + +### Xcode Patch ### +**/xcshareddata/WorkspaceSettings.xcsettings + +# End of https://www.gitignore.io/api/xcode diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml deleted file mode 100644 index 681f41a..0000000 --- a/android/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - \ No newline at end of file diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml deleted file mode 100644 index b68060b..0000000 --- a/android/.idea/gradle.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml deleted file mode 100644 index 0a8a7d0..0000000 --- a/android/.idea/misc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/android/.idea/modules.xml b/android/.idea/modules.xml deleted file mode 100644 index e54e28e..0000000 --- a/android/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/android/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/.idea/workspace.xml b/android/.idea/workspace.xml deleted file mode 100644 index edfcadd..0000000 --- a/android/.idea/workspace.xml +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1571041653772 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Android API 26 Platform - - - - - - - - \ No newline at end of file From 302b1fceaba1088aa0a3ebc9374b8c9fe2ff146d Mon Sep 17 00:00:00 2001 From: Pham Ngoc Thach Date: Thu, 14 May 2020 13:27:15 +0700 Subject: [PATCH 2/3] Fix verifyReleaseResources failed --- android/build.gradle | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index a28f0dd..8155086 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,3 +1,6 @@ +def safeExtGet(prop, fallback) { + rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback +} buildscript { repositories { @@ -12,12 +15,12 @@ buildscript { apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.1" + compileSdkVersion safeExtGet('compileSdkVersion', 23) + buildToolsVersion safeExtGet('buildToolsVersion', "23.0.1") defaultConfig { - minSdkVersion 16 - targetSdkVersion 22 + minSdkVersion safeExtGet('minSdkVersion', 16) + targetSdkVersion safeExtGet('targetSdkVersion', 22) versionCode 1 versionName "1.0" } @@ -33,4 +36,3 @@ repositories { dependencies { compile 'com.facebook.react:react-native:+' } - \ No newline at end of file From 3aa4294f0a59525e62d673a362524f9d817e94f1 Mon Sep 17 00:00:00 2001 From: Pham Ngoc Thach Date: Mon, 18 May 2020 10:14:15 +0700 Subject: [PATCH 3/3] Use implementation --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 8155086..ffca602 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -34,5 +34,5 @@ repositories { } dependencies { - compile 'com.facebook.react:react-native:+' + implementation 'com.facebook.react:react-native:+' }