From be798e174b6ba8cd91b7c28cc2ae64617b8e7e78 Mon Sep 17 00:00:00 2001 From: Corentin Garcia Date: Sat, 4 Feb 2023 14:33:52 +0100 Subject: [PATCH 1/4] feat: add data for 2022 --- app/src/main/res/raw/fr_values.csv | 1 + app/src/main/res/raw/uk_values.csv | 1 + app/src/main/res/raw/us_values.csv | 1 + 3 files changed, 3 insertions(+) diff --git a/app/src/main/res/raw/fr_values.csv b/app/src/main/res/raw/fr_values.csv index 949412f..7f85a82 100644 --- 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 index 3125bb7..9723c10 100644 --- 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 index 423a15f..8b2dfb4 100644 --- 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 From ca2fdfa9b158f99cac3b8abd7894b2d3a79d7d92 Mon Sep 17 00:00:00 2001 From: Corentin Garcia Date: Sat, 4 Feb 2023 14:34:51 +0100 Subject: [PATCH 2/4] chore: update dependencies --- app/build.gradle | 6 +++--- build.gradle | 4 ++-- gradle.properties | 4 ---- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a140ebf..1c6cca2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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/build.gradle b/build.gradle index 4bdee1b..309ddf7 100644 --- 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 index 09b3991..6d8d6ec 100644 --- 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 index f498790..ba1a15d 100644 --- 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 From d5860415fe371f35ab4cda7a83528101563e2d71 Mon Sep 17 00:00:00 2001 From: Corentin Garcia Date: Sat, 4 Feb 2023 14:38:20 +0100 Subject: [PATCH 3/4] chore: rename CI job --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fafcf88..8618c82 100644 --- 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: From 5509d4deac56e04581554192acbea6619fc750fd Mon Sep 17 00:00:00 2001 From: Corentin Garcia Date: Sat, 4 Feb 2023 14:38:50 +0100 Subject: [PATCH 4/4] feat: release 2.14 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1c6cca2..5422752 100644 --- 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" }