updating template

Author: hmarques98

.gitignore

@@ -2,76 +2,6 @@
 #
 .DS_Store
 
-# Xcode
-#
-template/build/
-template/*.pbxuser
-template/!default.pbxuser
-template/*.mode1v3
-template/!default.mode1v3
-template/*.mode2v3
-template/!default.mode2v3
-template/*.perspectivev3
-template/!default.perspectivev3
-template/xcuserdata
-template/*.xccheckout
-template/*.moved-aside
-template/DerivedData
-template/*.hmap
-template/*.ipa
-template/*.xcuserstate
-template/Pods/
-
-# Android/IntelliJ
-#
-template/build/
-template/.idea
-template/.gradle
-template/local.properties
-template/*.iml
-
-# Visual Studio Code
-#
-.vscode/
-
-
-# node.js
-#
-template/node_modules/
-template/npm-debug.log
-template/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
-template/ios/Pods/
-template/ios/Podfile.lock
-template/android/build/
-
-.DS_Store
-
-# OSX
-#
-.DS_Store
-
 # Xcode
 #
 build/
@@ -125,6 +55,7 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
+*/fastlane/firebaseFastlane.json
 
 # Bundle artifact
 *.jsbundle

template/App.tsx

@@ -6,11 +6,9 @@ import { FileLogger } from 'react-native-file-logger';
 import { SENTRY_DSN, ENV, ONESIGNAL_ANDROID_KEY } from '@env';
 import * as Sentry from '@sentry/react-native';
 import codePush, { CodePushOptions } from 'react-native-code-push';
-import useAppState from 'react-native-appstate-hook';
 import { Provider } from 'react-redux';
 import store from '@store/index';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { warn } from '@utils/console';
 import { theme } from 'theme';
 import { ThemeProvider } from 'styled-components';
 
@@ -37,12 +35,6 @@ const queryClient = new QueryClient();
 const App = () => {
   useNavigationMounting();
 
-  useAppState({
-    onChange: (newAppState) => warn('App state changed to ', newAppState),
-    onForeground: () => warn('App went to Foreground'),
-    onBackground: () => warn('App went to background'),
-  });
-
   return (
     <Provider store={store}>
       <QueryClientProvider client={queryClient}>

template/_gitignore

@@ -57,6 +57,7 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
+*/fastlane/firebaseFastlane.json
 
 # Bundle artifact
 *.jsbundle

template/android/app/build.gradle

@@ -155,6 +155,7 @@ android {
         testBuildType System.getProperty('testBuildType', 'debug')  // This will later be used to control the test apk build type
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
+
     splits {
         abi {
             reset()
@@ -183,8 +184,17 @@ android {
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
+            debuggable true
             resValue "string", "CodePushDeploymentKey", '""'
+            applicationIdSuffix ".debug"
+        }
+
+        staging {
+            initWith debug
+            manifestPlaceholders = [hostName:"internal.helloWorld.com"]
+            applicationIdSuffix ".debugStaging"
         }
+
         release {
             // Caution! In production, you need to generate your own keystore file.
             // see https://reactnative.dev/docs/signed-apk-android.
@@ -194,6 +204,18 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
+    // https://developer.android.com/studio/build/build-variants#groovy
+    productFlavors {
+        development {
+            applicationIdSuffix ".development"
+            versionNameSuffix "-development"
+        }
+
+        staging {
+            applicationIdSuffix ".staging"
+            versionNameSuffix "-staging"
+        }
+    }
 
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
@@ -222,7 +244,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-core:16.0.0'
     // implementation platform('com.google.firebase:firebase-bom:28.0.1')
     implementation 'androidx.multidex:multidex:2.0.1'
-    compile project(':react-native-vector-icons')
+    implementation project(':react-native-vector-icons')
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
       exclude group:'com.facebook.fbjni'

template/android/build.gradle

@@ -4,8 +4,8 @@ buildscript {
     ext {
         buildToolsVersion = "29.0.3"
         minSdkVersion = 21
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        compileSdkVersion = 30
+        targetSdkVersion = 30
         ndkVersion = "20.1.5948944"
         androidXCore = "1.3.2"
         kotlinVersion = '1.4.0'

template/fastlane/AppFile

@@ -0,0 +1,2 @@
+json_key_file "fastlane/firebaseFastlane.json"
+# package_name "example.react.native.HelloWorld"

template/fastlane/Fastfile

@@ -6,64 +6,108 @@ platform :android do
   # For android, you should setup signing for release builds.
   # Currently, the default debug keystore is used. 
   desc 'Build the staging release APK.'
-  private_lane :build_staging do
+  private_lane :build_staging_apk do
     gradle(task: 'clean', project_dir: 'android/')
     gradle(
       project_dir: "android/",
       task: "assemble",
+      flavor: "Development",
       build_type: "Release"
     )
-  end
+  end 
 
   desc 'Build the production release APK.'
-  private_lane :build_production do
+  private_lane :build_production_apk do
     gradle(task: 'clean', project_dir: 'android/')
-    sh("npm", "run", "make-apk:productionRelease")
+    gradle(
+      project_dir: "android/",
+      task: "assemble",
+      build_type: "Release"
+    )
   end
 
+  desc 'Build the staging release bundle.'
+  private_lane :build_staging_bundle do
+    gradle(task: 'clean', project_dir: 'android/')
+    gradle(
+      project_dir: "android/",
+      task: "bundle",
+      flavor: "Development",
+      build_type: "Release"
+    )
+  end 
+
+  desc 'Build the product release bundle.'
+  private_lane :build_production_bundle do
+    gradle(task: 'clean', project_dir: 'android/')
+    gradle(
+      project_dir: "android/",
+      task: "bundle",
+      build_type: "Release"
+    )
+  end 
+
   desc 'Upload the release APK to App Center.'
-  private_lane :upload do |options|
+  private_lane :upload_apk_app_center do |options|
     release_notes = options[:notes]
     appcenter_upload(
         api_token: ENV["APPCENTER_API_TOKEN"],
         owner_name: ENV["APPCENTER_OWNER_NAME"],
         app_name: ENV["APPCENTER_APP_NAME"],
-        apk: "./android/app/build/outputs/apk/release/app-release.apk",
+        file: "./android/app/build/outputs/apk/release/app-release.apk",
         notify_testers: ENV["NOTIFY_TESTERS"],
         destinations: ENV["DESTINATIONS"],
         release_notes: release_notes
         )
   end
 
-  desc 'Build, deploy staging Android.'
-  lane :deploy_staging do
-    build_staging
-    upload
+  desc 'Upload the release Bundle to App Center.'
+  private_lane :upload_bundle_app_center do |options|
+    release_notes = options[:notes]
+    appcenter_upload(
+        api_token: ENV["APPCENTER_API_TOKEN"],
+        owner_name: ENV["APPCENTER_OWNER_NAME"],
+        app_name: ENV["APPCENTER_APP_NAME"],
+        file: "./android/app/build/outputs/bundle/release/app-release.aab",
+        notify_testers: ENV["NOTIFY_TESTERS"],
+        destinations: ENV["DESTINATIONS"],
+        release_notes: release_notes
+        )
   end
 
-  desc 'Build, deploy production Android.'
-  lane :deploy_production do
-    build_production
-    upload
+  desc 'Upload the release Bundle to Google Play Console with Roll out in 50%.'
+  private_lane :upload_bundle_play_console do
+    upload_to_play_store(
+      track: 'production',
+      rollout: '0.5',
+      aab: "./android/app/build/outputs/bundle/release/app-release.aab"
+      )
   end
 
-  desc 'Bump, badge, deploy staging Android.'
-  lane :bump_badge_deploy_staging do
+  desc 'Bump badge and build staging Android APK.'
+  lane :bump_badge_build_staging_apk do
     bump_badge
-    deploy_staging
+    build_staging_apk
   end
 
-  desc 'Bump, badge, build staging Android.'
-  lane :bump_badge_build_staging do
-    bump_badge
-    build_staging
+  desc 'Build and deploy staging Android APK.'
+  lane :deploy_staging do
+    bump_badge_build_staging_apk
+    upload_apk_app_center
   end
-  
-  desc 'Bump, badge, deploy production Android.'
-  lane :bump_badge_deploy_prod do
+
+  desc 'Bump badge and build production Bundle Android.'
+  lane :bump_badge_build_production_bundle do
     bump_badge
-    deploy_production
+    build_production_bundle
   end
+
+  desc 'Bump, build and deploy production Bundle Android.'
+  lane :deploy_production do
+    bump_badge_build_production_bundle
+    upload_bundle_app_center
+  end
+  
 end
 
 # -------------iOS Sign, Build & Deploy-------------#
@@ -84,7 +128,7 @@ platform :ios do
   end
 
   desc 'Build the staging release iOS application.'
-  private_lane :build_staging do
+  private_lane :build_staging_apk do
     package = load_json(json_path: "./package.json")
     gym(
       scheme: "STAGING",
@@ -94,7 +138,7 @@ platform :ios do
   end
 
   desc 'Build the production release iOS application.'
-  private_lane :build_production do
+  private_lane :build_production_apk do
     package = load_json(json_path: "./package.json")
     gym(
       scheme: "PRODUCTION",
@@ -121,14 +165,14 @@ platform :ios do
   desc 'Sign, build, deploy staging iOS.'
   lane :deploy_staging do
     certificates
-    build_staging
+    build_staging_apk
     upload
   end
 
   desc 'Sign, build, deploy production iOS.'
   lane :deploy_production do
     certificates
-    build_production
+    build_production_apk
     upload
   end