Merge pull request #167 from corenting/feat/update-data

feat: update data for 2022
corenting · Feb 4, 2023 · fffe8e9 · fffe8e9
2 parents 6626a57 + 5509d4d
commit fffe8e9
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,6 +8,7 @@ on:
 
 jobs:
   ci:
+    name: Build and test app
     runs-on: ubuntu-latest
 
     steps:

diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "fr.corenting.convertisseureurofranc"
         minSdkVersion 17
         targetSdkVersion 33
-        versionCode 22
-        versionName "2.13"
+        versionCode 23
+        versionName "2.14"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -40,15 +40,15 @@ dependencies {
     // Dependencies
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
 
 
     // Tests
     testImplementation 'androidx.test:core-ktx:1.5.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:4.10.0'
-    testImplementation "org.robolectric:robolectric:4.9.1"
+    testImplementation 'org.mockito:mockito-core:5.0.0'
+    testImplementation "org.robolectric:robolectric:4.9.2"
 }
 
 repositories {

diff --git a/app/src/main/res/raw/fr_values.csv b/app/src/main/res/raw/fr_values.csv
@@ -1,3 +1,4 @@
+2022;112.01
 2021;106.45
 2020;104.73
 2019;104.23

diff --git a/app/src/main/res/raw/uk_values.csv b/app/src/main/res/raw/uk_values.csv
@@ -1,3 +1,4 @@
+2022;1342.6
 2021;1203.2
 2020;1156.4
 2019;1139.3

diff --git a/app/src/main/res/raw/us_values.csv b/app/src/main/res/raw/us_values.csv
@@ -1,3 +1,4 @@
+2022;292.655
 2021;270.970
 2020;258.811
 2019;255.657

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,2 @@
-org.gradle.jvmargs=-Xmx1536m
-
 kotlin.code.style=official
-
 android.useAndroidX=true
-android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ on: @@
     jobs:
       ci:
+        name: Build and test app
         runs-on: ubuntu-latest
         steps:
@@ Expand Down @@