Merge pull request 'Update plugin com.android.application to v8.3.2' (#57) from renovate/com.android.application-8.x into main

Reviewed-on: #57

.github/workflows/build.yml

@@ -32,7 +32,7 @@ jobs:
           gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch keystore.asc > app/keystore.properties
           gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch key.asc > app/key.jks          
 
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/wrapper-validation-action@v3
 
       - name: create and checkout branch
         if: github.event_name == 'pull_request'

app/src/main/assets/geoloc_state.txt

@@ -1030,7 +1030,7 @@ GRC_AT|GRC|Attica|3853
 GRC_CR|GRC|Crete|8391
 GRC_EM|GRC|Epirusand Western Macedonia|18771
 GRC_MH|GRC|Macedonia and Thrace|33122
-GRC_PW|GRC|Peloponnese, Western Greeceand|29194
+GRC_PW|GRC|Peloponnese, Western Greece and the Ionian|29194
 GRC_TC|GRC|Thessalyand Central Greece|29744
 GRL_KU|GRL|Kujalleq|45647
 GRL_UO|GRL|Northeast Greenland National Par|919384
@@ -1537,8 +1537,8 @@ LAO_OU|LAO|Oudômxai|11832
 LAO_PH|LAO|Phôngsali|15414
 LAO_SL|LAO|Saravan|10238
 LAO_SV|LAO|Savannakhét|21546
-LAO_VI|LAO|Vientiane|12590
+LAO_VI|LAO|Vientiane Province|12590
-LAO_VT|LAO|Vientiane[prefecture]|3639
+LAO_VT|LAO|Vientiane Prefecture|3639
 LAO_XA|LAO|Xaignabouri|15691
 LAO_XS|LAO|Xaisômboun|7778
 LAO_XE|LAO|Xékong|8414
@@ -1613,7 +1613,7 @@ LIE_SN|LIE|Schaan|28
 LIE_SB|LIE|Schellenberg|3
 LIE_TN|LIE|Triesen|26
 LIE_TB|LIE|Triesenberg|29
-LIE_VA|LIE|Valduz|17
+LIE_VA|LIE|Vaduz|17
 LTU_AS|LTU|Alytaus|5624
 LTU_KS|LTU|Kauno|8156
 LTU_KP|LTU|Klaipedos|5363
@@ -1794,7 +1794,7 @@ MHL_Ujae|MHL|Ujae|3
 MHL_Utirik|MHL|Utirik|14
 MHL_Wotho|MHL|Wotho|6
 MHL_Wotje|MHL|Wotje|15
-MHL_19_1|MHL|NA|26
+MHL_19_1|MHL|Rongelap|26
 MTQ_FF|MTQ|Fort-de-France|189
 MTQ_MA|MTQ|Le Marin|393
 MTQ_TR|MTQ|Le Trinité|353
@@ -2040,7 +2040,7 @@ NLD_OV|NLD|Overijssel|3369
 NLD_UT|NLD|Utrecht|1555
 NLD_ZE|NLD|Zeeland|1804
 NLD_Zeeuwsemeren|NLD|Zeeuwsemeren|477
-NLD_14_1|NLD|NA|3143
+NLD_14_1|NLD|Zuid-Holland|3143
 NCL_IL|NCL|Îles Loyauté|1988
 NCL_NO|NCL|Nord|9520
 NCL_SU|NCL|Sud|7408
@@ -3340,7 +3340,6 @@ UGA_SR|UGA|Soroti|3401
 UGA_TR|UGA|Tororo|1863
 UGA_WA|UGA|Wakiso|1944
 UGA_YU|UGA|Yumbe|2337
-UKR_?|UKR|?|136
 UKR_CK|UKR|Cherkasy|20922
 UKR_CH|UKR|Chernihiv|32416
 UKR_CV|UKR|Chernivtsi|8202
@@ -3352,7 +3351,7 @@ UKR_KK|UKR|Kharkiv|31388
 UKR_KS|UKR|Kherson|25534
 UKR_KM|UKR|Khmel'nyts'kyy|20718
 UKR_KV|UKR|Kiev|28073
-UKR_KC|UKR|Kiev City|695
+UKR_KC|UKR|Kiev City|831
 UKR_KH|UKR|Kirovohrad|24713
 UKR_LV|UKR|L'viv|21773
 UKR_LH|UKR|Luhans'k|27042

app/src/main/java/net/helcel/beans/countries/Country.kt

@@ -5,9 +5,10 @@ enum class Country(
     override val area: Int
 ) : GeoLoc {
     ATA("Antarctica", 14000000),
-    HKG("Hong Kong", 1104),
+
-    MAC("Macao", 32),
+    //    HKG("Hong Kong", 1104),
-    ANT("Netherlands Antilles", 800),
+//    MAC("Macao", 32),
+//    ANT("Netherlands Antilles", 800),
     AFG("Afghanistan", 645487),
     XAD("Akrotiri and Dhekelia", 234),
     ALA("Åland", 1483),

app/src/main/java/net/helcel/beans/countries/Group.kt

@@ -6,7 +6,6 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
 
     EEE(
         "Europe", setOf(
-            XAD,
             ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
             ALB,
             AND,
@@ -16,7 +15,6 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
             BIH,
             BGR,
             HRV,
-            CYP,
             CZE,
             DNK,
             EST,
@@ -26,6 +24,7 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
             DEU,
             GIB, // Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
             GRC,
+            GRL,
             GGY, // Guernsey: a British Crown dependency in the English Channel
             HUN,
             ISL,
@@ -33,7 +32,6 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
             IMN, // Isle of Man: a British Crown dependency located in the Irish Sea
             ITA,
             JEY, // Jersey: a British Crown dependency located in the English Channel
-            KAZ,
             XKO,
             LVA,
             LIE,
@@ -65,6 +63,7 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
     ),
     ABB(
         "Asia", setOf(
+            XAD,
             AFG,
             ARM,
             AZE,
@@ -77,8 +76,9 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
             CCK, // Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
             CHN,
             CXR, // Christmas Island: an Australian external territory in the Indian Ocean
+            CYP,
             GEO,
-            HKG,
+            //HKG,
             IND,
             IDN,
             IRN,
@@ -86,11 +86,12 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
             ISR,
             JPN,
             JOR,
+            KAZ,
             KWT,
             KGZ,
             LAO,
             LBN,
-            MAC,
+            //MAC,
             MYS,
             MDV,
             MNG,
@@ -127,6 +128,7 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
             BDI,
             BEN,
             BWA,
+            BVT, // Bouvet Island: an uninhabited territory of Norway in the South Atlantic
             BFA,
             BDI,
             CPV,
@@ -148,6 +150,7 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
             GHA,
             GIN,
             GNB,
+            HMD, // Heard Island and McDonald Islands: an uninhabited Australian external territory in the southern Indian Ocean
             KEN,
             LSO,
             LBR,
@@ -206,7 +209,6 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
             DMA,
             DOM,
             SLV,
-            GRL,
             GRD,
             GLP,
             GTM,
@@ -216,7 +218,7 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
             MTQ,
             MEX,
             MSR,
-            ANT,
+            //ANT,
             CUW,
             NIC,
             PAN,
@@ -248,6 +250,7 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
             GUY,
             PRY,
             PER,
+            SGS, // South Georgia and the South Sandwich Islands: a British overseas territory in the southern Atlantic Ocean
             SUR,
             URY,
             VEN,
@@ -284,11 +287,8 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
     ),
 
     XXX(
-        "Others", setOf(
+        "Antarctica", setOf(
             ATA, // Antarctica: not in any other region
-            BVT, // Bouvet Island: an uninhabited territory of Norway in the South Atlantic
-            HMD, // Heard Island and McDonald Islands: an uninhabited Australian external territory in the southern Indian Ocean
-            SGS, // South Georgia and the South Sandwich Islands: a British overseas territory in the southern Atlantic Ocean
         )
     ),
 

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.3.1' apply false
+    id 'com.android.application' version '8.3.2' apply false
-    id 'com.android.library' version '8.3.1' apply false
+    id 'com.android.library' version '8.3.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
 }

genenum.js

@@ -63,8 +63,8 @@ const formatStr = (str)=> str.replace(/(?<!\b\w\u00E0-\u00FC)\B[A-Z\u00C0-\u00DC
       return ', ';
   } else {
       return ' ' + match;
-  }}).replace("ofthe "," of the ").replace("dela ", " de la ").replace("delos ", " de los ").replace("áD","á D")
+  }}).replace("ofthe "," of the ").replace("dela ", " de la ").replace("delos ", " de los ").replace("áD","á D").replace("eÁ","e Á")
-  .replace("Côted'","Côte d'").replace("leof ","le of ").replace("dde ","d de ").replace("iode ","io de ").replace("àde ","à de ")
+  .replace("ed'","e d'").replace("leof ","le of ").replace("dde ","d de ").replace("iode ","io de ").replace("àde ","à de ")
   .replace("yof ","y of ").replace("Andrésy ","Andrés y")
   .replace("aand ","a and ").replace("iand ", "i and ").replace("tsand ","ts and ").replace("onand ","on and ").replace("reand ", "re and ")
   .replace("odel ","o del ").replace("adel ", "a del ").replace("ndel ","n del ").replace("zdel ","z del ").replace("falde ", "fal de ").replace("casdel ","cas del ")
@@ -76,6 +76,11 @@ const formatStr = (str)=> str.replace(/(?<!\b\w\u00E0-\u00FC)\B[A-Z\u00C0-\u00DC
   .replace("Valledel ","Valle del ").replace("Valde ","Val de ").replace("Îlesdu ","Îles du ")
   .replace("sÉ","s É").replace("áO","á O").replace("N C Tof ","NCT of ").replace("N A","NA")
   .replace("Nortede ", "Norte de ")
+  .replace("Pinardel ", "Pinar del ")
+  .replace("Greeceand", "Greece and the Ionian")
+  .replace("Vientiane", "Vientiane Province")
+  .replace("Vientiane Province[prefecture]", "Vientiane Prefecture")
+  .replace("Valduz", "Vaduz")
   .trim()
 
 const parse0 = (country) => {

gradle/wrapper/gradle-wrapper.properties

@@ -5,3 +5,4 @@ networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d