Add revision: v1.26.5

LICENSE.officially.txt

@@ -350,7 +350,7 @@ Die verwendeten Open-Source-Bibliotheken unterliegen den folgenden Nutzungsbedin
 
 OpenSSL
   Lizenz: Apache 2.0
-  Version: 3.0.8
+  Version: 3.0.9
   Adresse: https://www.openssl.org/
 
 Qt

LICENSE.txt

@@ -318,7 +318,7 @@ Die verwendeten Open-Source-Bibliotheken unterliegen den folgenden Nutzungsbedin
 
 OpenSSL
   Lizenz: Apache 2.0
-  Version: 3.0.8
+  Version: 3.0.9
   Adresse: https://www.openssl.org/
 
 Qt

libs/build.gradle → ausweisapp/build.gradle

@@ -1,2 +1,4 @@
 configurations.maybeCreate("default")
 artifacts.add("default", file('ausweisapp2.aar'))
+group = 'com.governikus'
+version = ausweisapp_version

build.gradle

@@ -1,6 +1,7 @@
 buildscript {
-    ext.kotlin_version = '1.8.10'
-    ext.sdkwrapper_version = "1.26.4.0"
+    ext.kotlin_version = '1.8.21'
+    ext.ausweisapp_version = '1.26.5'
+    ext.sdkwrapper_version = "$ausweisapp_version.0"
 
     repositories {
         google()
@@ -28,15 +29,15 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven { url "$project.rootDir/libs" }
+        maven { url "$project.rootDir/ausweisapp" }
     }
 }
 
 task tarball(type: Tar) {
     into ('/') {
         from rootDir
         include '**'
-        exclude ('**/build/**', 'tester', '.reviewboardrc', '.gradle', '.idea', 'jenkins')
+        exclude ('**/build/**', 'tester', '.reviewboardrc', '.gradle', '.idea', 'jenkins', '**/*.aar')
      }
 
     destinationDirectory = file('build/tar')

sdkwrapper/build.gradle

@@ -10,7 +10,7 @@ android {
     namespace "de.governikus.ausweisapp2.sdkwrapper"
 
     defaultConfig {
-        buildToolsVersion "30.0.3"
+        buildToolsVersion "33.0.2"
         minSdkVersion 24
         targetSdkVersion 33
         versionCode 2
@@ -119,32 +119,30 @@ afterEvaluate {
     }
 }
 
-def useLocal = file("${rootDir}/libs/ausweisapp2.aar").exists();
+def useLocal = file("${rootDir}/ausweisapp/ausweisapp2.aar").exists();
 
 dependencies {
     if (useLocal) {
-        implementation project(':libs')
-        if(useLocal) {
-                println "⚠   ⚠   ⚠   ⚠   WARNING  ⚠   ⚠   ⚠   ⚠\n" +
-                "   Using local SDK might be outdated  \n" +
-                "⚠  Delete local SDK in lib folder to ⚠\n" +
-                "   use latest version!                \n" +
-                "⚠   ⚠   ⚠   ⚠   WARNING  ⚠   ⚠   ⚠   ⚠"
-        }
+        implementation project(':ausweisapp')
+        println "⚠   ⚠   ⚠   ⚠   WARNING  ⚠   ⚠   ⚠   ⚠\n" +
+        "   Using local SDK might be outdated  \n" +
+        "⚠  Delete local SDK in lib folder to ⚠\n" +
+        "   use latest version!                \n" +
+        "⚠   ⚠   ⚠   ⚠   WARNING  ⚠   ⚠   ⚠   ⚠"
     }
     else {
-        implementation 'com.governikus:ausweisapp:1.26.4'
+        implementation "com.governikus:ausweisapp:$ausweisapp_version"
     }
 
     implementation 'com.google.code.gson:gson:2.10.1'
 
     testImplementation "junit:junit:4.13.2"
     testImplementation 'androidx.test:core:1.5.0'
-    testImplementation 'org.robolectric:robolectric:4.9.2'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
+    testImplementation 'org.robolectric:robolectric:4.10.3'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
+    androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1'
 
 }

sdkwrapper/src/test/java/de/governikus/ausweisapp2/sdkwrapper/card/core/WorkflowControllerTest.kt

@@ -33,6 +33,7 @@ import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
+import kotlin.time.Duration.Companion.milliseconds
 
 @RunWith(RobolectricTestRunner::class)
 @Config(manifest = Config.NONE, sdk = [24])
@@ -61,7 +62,7 @@ class WorkflowControllerTest {
     }
 
     @Test
-    fun testOnStarted() = runTest(dispatchTimeoutMs = 1000) {
+    fun testOnStarted() = runTest(timeout = 1000.milliseconds) {
         assertNotNull(workflowController)
         val workflowController = workflowController!!
 
@@ -82,7 +83,7 @@ class WorkflowControllerTest {
     }
 
     @Test
-    fun testErrorNotStarted() = runTest(dispatchTimeoutMs = 1000) {
+    fun testErrorNotStarted() = runTest(timeout = 1000.milliseconds) {
         assertNotNull(workflowController)
         val workflowController = workflowController!!
 
@@ -103,7 +104,7 @@ class WorkflowControllerTest {
     }
 
     @Test
-    fun testAuthenticationStarted() = runTest(dispatchTimeoutMs = 1000) {
+    fun testAuthenticationStarted() = runTest(timeout = 1000.milliseconds) {
         assertNotNull(workflowController)
         assertNotNull(connection)
         val workflowController = workflowController!!
@@ -137,7 +138,7 @@ class WorkflowControllerTest {
     }
 
     @Test
-    fun testFullAuthentication() = runTest(dispatchTimeoutMs = 1000) {
+    fun testFullAuthentication() = runTest(timeout = 1000.milliseconds) {
         assertNotNull(workflowController)
         assertNotNull(connection)
         val workflowController = workflowController!!

settings.gradle

@@ -1 +1 @@
-include ':tester', ':sdkwrapper', ':libs'
+include ':tester', ':sdkwrapper', ':ausweisapp'

third_party_licenses/LICENSES.md

@@ -7,4 +7,4 @@ com.google.code.gson:gson:2.10.1
 OPEN-SOURCE-LIZENZ FÜR DIE EUROPÄISCHE UNION - EUPL.md
 ======================================================
 
-com.governikus:ausweisapp:1.26.4
+com.governikus:ausweisapp:1.26.5