v1.0.5

Author: mshekspirtt

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.0.5
+
+### Changed
+
+- Updated minimum supported SDK version to `minSdkVersion` 23 to meet the requirements of `react-native` version 0.73.0.
+- Updated the country code retrieval function to prioritize the **system language** instead of the app language on Android.
+
 ## v1.0.4
 
 ### Changed

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         }
 
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.5.3'
+            classpath 'com.android.tools.build:gradle:7.4.0'
         }
     }
 }
@@ -18,11 +18,11 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('DeviceCountry_compileSdkVersion', 31)
+    compileSdkVersion safeExtGet('DeviceCountry_compileSdkVersion', 33)
     buildToolsVersion safeExtGet('DeviceCountry_buildToolsVersion', '29.0.2')
     defaultConfig {
-        minSdkVersion safeExtGet('DeviceCountry_minSdkVersion', 16)
-        targetSdkVersion safeExtGet('DeviceCountry_targetSdkVersion', 31)
+        minSdkVersion safeExtGet('DeviceCountry_minSdkVersion', 23)
+        targetSdkVersion safeExtGet('DeviceCountry_targetSdkVersion', 33)
         versionCode 1
         versionName "1.0"
 
@@ -49,6 +49,7 @@ repositories {
         url("$rootDir/../node_modules/react-native/android")
     }
     google()
+    mavenCentral()
     jcenter()
 }
 

android/src/main/java/com/reactnativedevicecountry/DeviceCountryModule.java

@@ -3,6 +3,9 @@
 import android.content.Context;
 import android.telephony.TelephonyManager;
 import androidx.annotation.NonNull;
+import android.content.res.Resources; 
+import android.os.Build; 
+import java.util.Locale; 
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -85,15 +88,19 @@ protected String getCountryCodeFromTelephonyManager() {
     }
   }
 
-  protected String getCountryCodeFromConfiguration() {
+ protected String getCountryCodeFromConfiguration() {
     try {
-      String countryCode = reactContext
-        .getResources()
-        .getConfiguration()
-        .locale.getCountry();
-      return countryCode;
+        Locale systemLocale;
+        
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            systemLocale = Resources.getSystem().getConfiguration().getLocales().get(0);
+        } else {
+            systemLocale = Resources.getSystem().getConfiguration().locale;
+        }
+        
+        return systemLocale.getCountry();
     } catch (Exception e) {
-      return null;
+        return null;
     }
-  }
+}
 }

example/android/app/build.gradle

@@ -210,7 +210,7 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
     into 'libs'
 }
 

example/android/build.gradle

@@ -3,16 +3,16 @@
 buildscript {
     ext {
         buildToolsVersion = "29.0.2"
-        minSdkVersion = 16
-        compileSdkVersion = 29
+        minSdkVersion = 23
+        compileSdkVersion = 33
         targetSdkVersion = 29
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.3")
+        classpath("com.android.tools.build:gradle:7.4.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

example/android/gradle.properties

@@ -19,4 +19,4 @@
 
 android.useAndroidX=true
 android.enableJetifier=true
-FLIPPER_VERSION=0.54.0
+FLIPPER_VERSION=0.125.0

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-device-country",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Get device location by telephony (SIM card) or settings without using GPS tracker.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",