From eb0185aa4c35fcd0001945c584ecb3043ea48195 Mon Sep 17 00:00:00 2001
From: Ashley White <hello@ashleyd.ws>
Date: Tue, 27 Feb 2018 19:49:11 +0100
Subject: [PATCH 1/2] Use imports and export default

---
 LocaleBaseClass.js | 24 +++++++++++-------------
 index.android.js   |  8 +++-----
 index.ios.js       | 26 ++++++++++++--------------
 package.json       |  2 +-
 4 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/LocaleBaseClass.js b/LocaleBaseClass.js
index cfafdf5..0dd4732 100644
--- a/LocaleBaseClass.js
+++ b/LocaleBaseClass.js
@@ -1,34 +1,32 @@
-import { Platform, NativeModules } from 'react-native';
-const NativeLocale = NativeModules.Locale;
+import { NativeEventEmitter, NativeModules } from 'react-native';
+const RCTLocale = NativeModules.Locale;
 const warning = require('fbjs/lib/warning');
 
-class LocaleBaseClass {
+export default class LocaleBaseClass {
 
 	static constants() {
-		return NativeLocale;
+		return RCTLocale;
 	}
 
-	static numberFromDecimalString(number : string) {
-		return NativeLocale.numberFromDecimalString(number);
+	static numberFromDecimalString(number) {
+		return RCTLocale.numberFromDecimalString(number);
 	}
 
-	static decimalStyle(number : number) {
-		return NativeLocale.decimalStyle(number);
+	static decimalStyle(number) {
+		return RCTLocale.decimalStyle(number);
 	}
 
-	static validateDateFormatStyle(style : string) {
+	static validateDateFormatStyle(style) {
 		let valid = ['full', 'long', 'medium', 'short', 'none'];
 		if(Platform.OS == 'ios')
 			valid.push('default');
 		return valid.indexOf(style) >= 0;
 	}
 
-	static dateFormat(date, dateStyle : string, timeStyle : string) {
+	static dateFormat(date, dateStyle, timeStyle) {
 		warning(LocaleBaseClass.validateDateFormatStyle(dateStyle), 'Locale: DateStyle must be one of [full/long/medium/short/none]');
 		warning(LocaleBaseClass.validateDateFormatStyle(timeStyle), 'Locale: TimeStyle must be one of [full/long/medium/short/none]');
-		return NativeLocale.dateFormat(date, dateStyle, timeStyle);
+		return RCTLocale.dateFormat(date, dateStyle, timeStyle);
 	}
 
 }
-
-module.exports = LocaleBaseClass;
diff --git a/index.android.js b/index.android.js
index 784e5fd..e06d161 100644
--- a/index.android.js
+++ b/index.android.js
@@ -1,14 +1,12 @@
-const LocaleBaseClass = require('./LocaleBaseClass');
+import LocaleBaseClass from './LocaleBaseClass';
 
-class Locale extends LocaleBaseClass {
+export default class Locale extends LocaleBaseClass {
 
 	/**
 	 * Android can't pass Long's as ReactMethod arguments so send a string that is parsed
 	 */
-	static dateFormat(date : Date, dateStyle : string, timeStyle : string) {
+	static dateFormat(date, dateStyle, timeStyle) {
 		return LocaleBaseClass.dateFormat(''+date.getTime(), dateStyle, timeStyle);
 	}
 
 }
-
-module.exports = Locale;
diff --git a/index.ios.js b/index.ios.js
index 8251c85..dfd415a 100644
--- a/index.ios.js
+++ b/index.ios.js
@@ -1,20 +1,18 @@
-import {NativeModules} from 'react-native';
-const NativeLocale = NativeModules.Locale;
-const LocaleBaseClass = require('./LocaleBaseClass');
+import { NativeModules } from 'react-native';
+import LocaleBaseClass from './LocaleBaseClass';
+const RCTLocale = NativeModules.Locale;
 
-class Locale extends LocaleBaseClass {
-	static currencyStyle(number : number) {
-		return NativeLocale.currencyStyle(number);
+export default class Locale extends LocaleBaseClass {
+	static currencyStyle(number) {
+		return RCTLocale.currencyStyle(number);
 	}
-	static percentStyle(number : number) {
-		return NativeLocale.percentStyle(number);
+	static percentStyle(number) {
+		return RCTLocale.percentStyle(number);
 	}
-	static scientificStyle(number : number) {
-		return NativeLocale.scientificStyle(number);
+	static scientificStyle(number) {
+		return RCTLocale.scientificStyle(number);
 	}
-	static spelloutStyle(number : number) {
-		return NativeLocale.scientificStyle(number);
+	static spelloutStyle(number) {
+		return RCTLocale.scientificStyle(number);
 	}
 }
-
-module.exports = Locale;
diff --git a/package.json b/package.json
index dfd3e7e..4064be1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-locale",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "Simple locale information and methods for react native",
   "repository": {
     "type": "git",

From 19aa3bc1684bdf3dc7d75c647f110c423b3e3c2a Mon Sep 17 00:00:00 2001
From: Ashley White <hello@ashleyd.ws>
Date: Wed, 30 Jan 2019 21:45:09 +0100
Subject: [PATCH 2/2] gradle and sdk versions

---
 android/build.gradle | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 38fbc27..5c91c21 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,16 @@
 apply plugin: 'com.android.library'
 
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion safeExtGet('compileSdkVersion', 27)
+    buildToolsVersion safeExtGet('buildToolsVersion', '28.0.2')
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 22
+        minSdkVersion safeExtGet('minSdkVersion', 16)
+        targetSdkVersion safeExtGet('targetSdkVersion', 27)
         versionCode 1
         versionName "1.0"
     }
@@ -20,5 +24,5 @@ repositories {
 }
 
 dependencies {
-    compile 'com.facebook.react:react-native:0.17.+'
+    implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
 }
\ No newline at end of file