Merge pull request #255 from admin-ch/feature/dependencies

Feature/dependencies
admin-ch · Sep 7, 2021 · c2c7716 · c2c7716
2 parents 395db07 + 4d56033
commit c2c7716
Show file tree

Hide file tree

Showing 10 changed files with 184 additions and 108 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-	ext.kotlin_version = "1.4.31"
+	ext.kotlin_version = "1.5.30"
 	repositories {
 		google()
 		mavenCentral()

diff --git a/common/build.gradle b/common/build.gradle
@@ -62,19 +62,19 @@ android {
 dependencies {
 	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-	api 'ch.admin.bag.covidcertificate:sdk-android:1.3.1'
-	api 'ch.admin.bag.covidcertificate:sdk-core:1.1.4'
+	api 'ch.admin.bag.covidcertificate:sdk-android:1.5'
+	api 'ch.admin.bag.covidcertificate:sdk-core:2.0'
 
 	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation 'androidx.core:core-ktx:1.3.2'
-	implementation 'androidx.appcompat:appcompat:1.2.0'
-	implementation 'androidx.fragment:fragment-ktx:1.3.3'
-	implementation 'com.google.android.material:material:1.3.0'
+	implementation 'androidx.core:core-ktx:1.6.0'
+	implementation 'androidx.appcompat:appcompat:1.3.1'
+	implementation 'androidx.fragment:fragment-ktx:1.3.6'
+	implementation 'com.google.android.material:material:1.4.0'
 	implementation 'androidx.security:security-crypto:1.0.0'
 	kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.12.0'
-	api 'androidx.camera:camera-camera2:1.0.0'
-	api 'androidx.camera:camera-view:1.0.0-alpha25'
-	api 'androidx.camera:camera-lifecycle:1.0.0'
+	api 'androidx.camera:camera-camera2:1.0.1'
+	api 'androidx.camera:camera-view:1.0.0-alpha28'
+	api 'androidx.camera:camera-lifecycle:1.0.1'
 
 	api "com.augustcellars.cose:cose-java:1.1.0"
 	api 'org.bouncycastle:bcprov-jdk15on:1.69'

diff --git a/common/src/main/res/values-de/strings.xml b/common/src/main/res/values-de/strings.xml
@@ -938,6 +938,7 @@ erstellt werden"</string>
     <string name="wallet_certificate_light_detail_text_2_bold">"nur muss keine"</string>
 
     <!-- VoiceOver reads this when the expandable box is reduced -->
+    <!-- Fuzzy -->
     <string name="accessibility_expandable_box_reduced_state">"reduziert"</string>
 
     <!-- VoiceOver reads this when the expandable box is expanded -->
@@ -1024,4 +1025,9 @@ Das «Zertifikat Light» ist lediglich elektronisch innerhalb der App verfügbar
 
     <!-- Einstellungen: Titel Sprachauswahl -->
     <string name="language_title">"Sprache"</string>
+
+    <!-- Information about the date format (always english) -->
+    <!-- Fuzzy -->
+    <string name="wallet_certificate_detail_date_format_info">"Date format used: dd.mm.yyyy"</string>
+    <string name="wallet_certificate_test_holder_and_name">"Hersteller/ Name"</string>
 </resources>
diff --git a/common/src/main/res/values-fr/strings.xml b/common/src/main/res/values-fr/strings.xml
@@ -906,9 +906,11 @@ et avec un document d’identité"</string>
     <string name="wallet_certificate_light_detail_text_2_bold">"n’est utilisable qu’en doit être aucun"</string>
 
     <!-- VoiceOver reads this when the expandable box is reduced -->
+    <!-- Fuzzy -->
     <string name="accessibility_expandable_box_reduced_state">"réduit"</string>
 
     <!-- VoiceOver reads this when the expandable box is expanded -->
+    <!-- Fuzzy -->
     <string name="accessibility_expandable_box_expanded_state">"étendu"</string>
 
     <!-- Header im Update Boarding-Screen -->
@@ -990,4 +992,9 @@ Le certificat light, reconnu uniquement en Suisse, n’est disponible que sous f
 
     <!-- Einstellungen: Titel Sprachauswahl -->
     <string name="language_title">"Langue"</string>
+
+    <!-- Information about the date format (always english) -->
+    <!-- Fuzzy -->
+    <string name="wallet_certificate_detail_date_format_info">"Date format used: dd.mm.yyyy"</string>
+    <string name="wallet_certificate_test_holder_and_name">"Fabricant/ Nom"</string>
 </resources>
diff --git a/common/src/main/res/values-it/strings.xml b/common/src/main/res/values-it/strings.xml
@@ -911,9 +911,11 @@ con un documento di legittimazione"</string>
     <string name="wallet_certificate_light_detail_text_2_bold">"solamente deve alcun"</string>
 
     <!-- VoiceOver reads this when the expandable box is reduced -->
+    <!-- Fuzzy -->
     <string name="accessibility_expandable_box_reduced_state">"compressa"</string>
 
     <!-- VoiceOver reads this when the expandable box is expanded -->
+    <!-- Fuzzy -->
     <string name="accessibility_expandable_box_expanded_state">"espansa"</string>
 
     <!-- Header im Update Boarding-Screen -->
@@ -995,4 +997,9 @@ Il «certificato light» è disponibile unicamente in versione elettronica nell'
 
     <!-- Einstellungen: Titel Sprachauswahl -->
     <string name="language_title">"Lingua"</string>
+
+    <!-- Information about the date format (always english) -->
+    <!-- Fuzzy -->
+    <string name="wallet_certificate_detail_date_format_info">"Date format used: dd.mm.yyyy"</string>
+    <string name="wallet_certificate_test_holder_and_name">"Fabbricante/ Nome"</string>
 </resources>
diff --git a/common/src/main/res/values-rm/strings.xml b/common/src/main/res/values-rm/strings.xml
@@ -50,7 +50,7 @@
     <string name="wallet_add_certificate">"Agiuntar"</string>
 
     <!-- Wallet: Homescreen Covid-Zertifikat -->
-    <string name="wallet_certificate">"Certificat covid"</string>
+    <string name="wallet_certificate">"Certificat COVID"</string>
 
     <!-- Wallet: Homescreen Erklärung -->
     <string name="wallet_homescreen_explanation">"Scannai il code QR sin il certificat COVID per al agiuntar a l'app."</string>
@@ -905,9 +905,11 @@ e mo en Svizra"</string>
     <string name="wallet_certificate_light_detail_text_2_bold">"mo danovamain nagins"</string>
 
     <!-- VoiceOver reads this when the expandable box is reduced -->
+    <!-- Fuzzy -->
     <string name="accessibility_expandable_box_reduced_state">"reducì"</string>
 
     <!-- VoiceOver reads this when the expandable box is expanded -->
+    <!-- Fuzzy -->
     <string name="accessibility_expandable_box_expanded_state">"extendì"</string>
 
     <!-- Header im Update Boarding-Screen -->
@@ -989,4 +991,9 @@ Il «certificat light» è disponibel mo en moda electronica entaifer l'app e ve
 
     <!-- Einstellungen: Titel Sprachauswahl -->
     <string name="language_title">"Lingua"</string>
+
+    <!-- Information about the date format (always english) -->
+    <!-- Fuzzy -->
+    <string name="wallet_certificate_detail_date_format_info">"Date format used: dd.mm.yyyy"</string>
+    <string name="wallet_certificate_test_holder_and_name">"Producent/ Num"</string>
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
@@ -766,7 +766,7 @@ invalid"</string>
 
 However, in order to show whether your certificate meets Switzerland’s validity criteria and how long it is valid for, the COVID Certificate app has to be online at regular intervals."</string>
     <string name="verifier_faq_works_question_2_1">"What are the current validity criteria in Switzerland?"</string>
-    <string name="verifier_faq_works_answer_2_1">"The current validity period of Covid certificates can be found here:"</string>
+    <string name="verifier_faq_works_answer_2_1">"The current validity period of COVID certificates can be found here:"</string>
     <string name="verifier_faq_works_linktext_2_1">"Further information"</string>
     <string name="verifier_faq_works_linkurl_2_1">"https://www.bag.admin.ch/bag/en/home/krankheiten/ausbrueche-epidemien-pandemien/aktuelle-ausbrueche-epidemien/novel-cov/covid-zertifikat.html#-837133624"</string>
     <string name="verifier_faq_works_question_7">"Is it possible to verify the certificates offline?"</string>
@@ -907,9 +907,11 @@ and in combination with an identity document"</string>
     <string name="wallet_certificate_light_detail_text_2_bold">"only has to does not"</string>
 
     <!-- VoiceOver reads this when the expandable box is reduced -->
+    <!-- Fuzzy -->
     <string name="accessibility_expandable_box_reduced_state">"reduced"</string>
 
     <!-- VoiceOver reads this when the expandable box is expanded -->
+    <!-- Fuzzy -->
     <string name="accessibility_expandable_box_expanded_state">"expanded"</string>
 
     <!-- Header im Update Boarding-Screen -->
@@ -991,4 +993,9 @@ The 'Certificate light' is only available electronically in the app and is only
 
     <!-- Einstellungen: Titel Sprachauswahl -->
     <string name="language_title">"Language"</string>
+
+    <!-- Information about the date format (always english) -->
+    <!-- Fuzzy -->
+    <string name="wallet_certificate_detail_date_format_info">"Date format used: dd.mm.yyyy"</string>
+    <string name="wallet_certificate_test_holder_and_name">"Manufacturer/ Name"</string>
 </resources>
diff --git a/verifier/build.gradle b/verifier/build.gradle
@@ -40,8 +40,8 @@ android {
 		applicationId "ch.admin.bag.covidcertificate.verifier"
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionCode 2400
-		versionName "2.4.0"
+		versionCode 2500
+		versionName "2.5.0"
 
 		// Stops the Gradle plugin’s automatic rasterization of vectors
 		generatedDensities = []
@@ -117,27 +117,27 @@ sonarqube {
 
 dependencies {
 	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation 'com.google.android.material:material:1.3.0'
+	implementation 'com.google.android.material:material:1.4.0'
 	implementation project(':common')
 
 	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-	implementation 'androidx.core:core-ktx:1.3.2'
-	implementation 'androidx.appcompat:appcompat:1.2.0'
-	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-	implementation 'androidx.fragment:fragment-ktx:1.3.3'
+	implementation 'androidx.core:core-ktx:1.6.0'
+	implementation 'androidx.appcompat:appcompat:1.3.1'
+	implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+	implementation 'androidx.fragment:fragment-ktx:1.3.6'
 	implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
 	implementation "androidx.viewpager2:viewpager2:1.0.0"
 	implementation 'androidx.security:security-crypto:1.0.0'
 
 	implementation 'com.squareup.retrofit2:retrofit:2.9.0'
 	implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
-	implementation 'com.squareup.okhttp3:logging-interceptor:4.7.2'
+	implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
 	implementation 'com.squareup.moshi:moshi:1.12.0'
 	kapt "com.squareup.moshi:moshi-kotlin-codegen:1.12.0"
 
-	testImplementation 'junit:junit:4.+'
-	androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-	androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+	testImplementation 'junit:junit:4.13.2'
+	androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+	androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -40,8 +40,8 @@ android {
 		applicationId "ch.admin.bag.covidcertificate.wallet"
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionCode 2400
-		versionName "2.4.0"
+		versionCode 2500
+		versionName "2.5.0"
 
 		// Stops the Gradle plugin’s automatic rasterization of vectors
 		generatedDensities = []
@@ -124,13 +124,13 @@ dependencies {
 	coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
 	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation 'com.google.android.material:material:1.3.0'
+	implementation 'com.google.android.material:material:1.4.0'
 	implementation project(':common')
 
-	implementation 'androidx.core:core-ktx:1.3.2'
-	implementation 'androidx.appcompat:appcompat:1.2.0'
-	implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-	implementation 'androidx.fragment:fragment-ktx:1.3.3'
+	implementation 'androidx.core:core-ktx:1.6.0'
+	implementation 'androidx.appcompat:appcompat:1.3.1'
+	implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+	implementation 'androidx.fragment:fragment-ktx:1.3.6'
 	implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
 	implementation 'androidx.viewpager2:viewpager2:1.0.0'
@@ -139,11 +139,11 @@ dependencies {
 
 	implementation 'com.squareup.retrofit2:retrofit:2.9.0'
 	implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
-	implementation 'com.squareup.okhttp3:logging-interceptor:4.7.2'
+	implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
 	implementation 'com.squareup.moshi:moshi:1.12.0'
 	kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.12.0'
 
-	testImplementation 'junit:junit:4.+'
-	androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-	androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+	testImplementation 'junit:junit:4.13.2'
+	androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+	androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }