From ba5c636dda6598bd9fc21b43496342cdc8921bf2 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Wed, 14 Aug 2019 23:44:57 +0200
Subject: [PATCH] Android: Fixed AndroidX transition issue

---
 ReactNativeClient/android/app/build.gradle | 4 ++--
 ReactNativeClient/package-lock.json        | 6 ++++++
 ReactNativeClient/package.json             | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ReactNativeClient/android/app/build.gradle b/ReactNativeClient/android/app/build.gradle
index fbceb68cc..997b9f0fc 100644
--- a/ReactNativeClient/android/app/build.gradle
+++ b/ReactNativeClient/android/app/build.gradle
@@ -94,8 +94,8 @@ android {
 		applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097533
-		versionName "1.0.297"
+		versionCode 2097534
+		versionName "1.0.298"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}
diff --git a/ReactNativeClient/package-lock.json b/ReactNativeClient/package-lock.json
index 816addffa..1afbd04d6 100644
--- a/ReactNativeClient/package-lock.json
+++ b/ReactNativeClient/package-lock.json
@@ -3763,6 +3763,12 @@
         "merge-stream": "^1.0.1"
       }
     },
+    "jetifier": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/jetifier/-/jetifier-1.6.4.tgz",
+      "integrity": "sha512-+f/4OLeqY8RAmXnonI1ffeY1DR8kMNJPhv5WMFehchf7U71cjMQVKkOz1n6asz6kfVoAqKNWJz1A/18i18AcXA==",
+      "dev": true
+    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
diff --git a/ReactNativeClient/package.json b/ReactNativeClient/package.json
index fb355d550..85aa35dca 100644
--- a/ReactNativeClient/package.json
+++ b/ReactNativeClient/package.json
@@ -6,7 +6,7 @@
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
-    "postinstall": "node ../Tools/copycss.js && node ../Tools/buildReactNativeInjectedJs.js && cd .. && npm i"
+    "postinstall": "node ../Tools/copycss.js && node ../Tools/buildReactNativeInjectedJs.js && npx jetify && cd .. && npm i"
   },
   "dependencies": {
     "@react-native-community/slider": "^1.1.3",
@@ -80,6 +80,7 @@
   "devDependencies": {
     "@babel/core": "^7.4.5",
     "@babel/runtime": "^7.4.5",
+    "jetifier": "^1.6.4",
     "metro-react-native-babel-preset": "^0.54.1",
     "react-test-renderer": "^16.8.3"
   }