Update dependencies; Croatia now uses EUR

feniworks · Jan 14, 2023 · daf920c · daf920c
1 parent 7fc2447
commit daf920c
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 24 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 1.8
+    - name: set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

diff --git a/PRIVACY_POLICY.md b/PRIVACY_POLICY.md
@@ -0,0 +1,3 @@
+This application does not collect or store personal data.
+
+If you installed this application from Google Play, then Google Play does collect some personal data. Please see the privacy policy for Google Play Services here: https://policies.google.com/privacy
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,14 +3,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
     buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId "com.feniworks.countrycodenew"
         minSdkVersion 15
-        targetSdkVersion 30
-        versionCode 2232
-        versionName "2.3.0"
+        targetSdkVersion 33
+        versionCode 2400
+        versionName '2.4.0'
     }
     buildTypes {
         release {
@@ -23,13 +23,14 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'com.feniworks.countrycodenew'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.21'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0'
 
-    def lifecycle_version = "2.2.0"
+    def lifecycle_version = "2.5.1"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.feniworks.countrycodenew" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -9,8 +8,8 @@
         android:fullBackupContent="true">
         <activity
             android:name="com.feniworks.countrycodenew.SplashActivity"
-            android:label="@string/app_name"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -19,8 +18,8 @@
         </activity>
         <activity
             android:name="com.feniworks.countrycodenew.MainActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
             </intent-filter>

diff --git a/app/src/main/assets/data.sql b/app/src/main/assets/data.sql
@@ -60,7 +60,7 @@ INSERT INTO countries ("code", "name", "capital", "currency", "iso2", "timezone"
 INSERT INTO countries ("code", "name", "capital", "currency", "iso2", "timezone") VALUES ('242', 'Congo', 'Brazzaville', 'XAF', 'CG', '+01:00');
 INSERT INTO countries ("code", "name", "capital", "currency", "iso2", "timezone") VALUES ('682', 'Cook Islands', 'Avarua', 'NZD', 'CK', '-10:00');
 INSERT INTO countries ("code", "name", "capital", "currency", "iso2", "timezone") VALUES ('506', 'Costa Rica', 'San Jose', 'CRC', 'CR', '-06:00');
-INSERT INTO countries ("code", "name", "capital", "currency", "iso2", "timezone") VALUES ('385', 'Croatia', 'Zagreb', 'HRK', 'HR', '+01:00');
+INSERT INTO countries ("code", "name", "capital", "currency", "iso2", "timezone") VALUES ('385', 'Croatia', 'Zagreb', 'EUR', 'HR', '+01:00');
 INSERT INTO countries ("code", "name", "capital", "currency", "iso2", "timezone") VALUES ('53', 'Cuba', 'Havana', 'CUP', 'CU', '-05:00');
 INSERT INTO countries ("code", "name", "capital", "currency", "iso2", "timezone") VALUES ('599', 'Curaçao', 'Willemstad', 'ANG', 'CW', '-04:00');
 INSERT INTO countries ("code", "name", "capital", "currency", "iso2", "timezone") VALUES ('357', 'Cyprus', 'Nicosia', 'EUR', 'CY', '+02:00');

diff --git a/app/src/main/java/com/feniworks/countrycodenew/DataBaseHelper.kt b/app/src/main/java/com/feniworks/countrycodenew/DataBaseHelper.kt
@@ -1,5 +1,6 @@
 package com.feniworks.countrycodenew
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
@@ -31,6 +32,7 @@ class DataBaseHelper internal constructor(private val context: Context) : SQLite
         onCreate(db)
     }
 
+    @SuppressLint("Range")
     fun findCountry(countryId: String): ArrayList<String> {
         val data = ArrayList<String>()
         val cursor = db.rawQuery("SELECT * FROM countries WHERE id = $countryId", null)
@@ -81,7 +83,7 @@ class DataBaseHelper internal constructor(private val context: Context) : SQLite
 
     companion object {
         private const val DB_NAME = "data"
-        private const val DATABASE_VERSION = 8
+        private const val DATABASE_VERSION = 9
     }
 
 }
diff --git a/app/src/main/java/com/feniworks/countrycodenew/MainActivity.kt b/app/src/main/java/com/feniworks/countrycodenew/MainActivity.kt
@@ -110,7 +110,7 @@ class MainActivity : Activity() {
             R.id.action_about -> {
                 val msg = Html.fromHtml("""
 Developed by Feniworks<br>
-Version ${BuildConfig.VERSION_NAME} (2021-01-31)<br><br>
+Version ${BuildConfig.VERSION_NAME} (2023-01-14)<br><br>
 If you like this application, please rate it with 5 stars in the Play Store :)<br><br>
 
 Icons courtesy of <a href="https://flagpedia.net/">flagpedia.net</a><br><br>

diff --git a/build.gradle b/build.gradle
@@ -1,19 +1,19 @@
 buildscript {
-    ext.kotlin_version = '1.4.21'
+    ext.kotlin_version = '1.7.20'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 27 21:40:05 ART 2021
+#Sat Jan 14 11:38:49 TRT 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME