Update dependencies (appmattus#141)

mattmook · web-flow · commit f927712ca02f · 2025-05-12T23:05:08.000+01:00
* Update to latest dependencies, including Kotlin 2.1.20
* Increase target sdk to api 36
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,13 +1,12 @@
 import com.appmattus.markdown.rules.LineLengthRule
 import com.appmattus.markdown.rules.ProperNamesRule
 import org.jetbrains.dokka.gradle.DokkaPlugin
-import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
 import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.net.URI
+import java.time.ZonedDateTime
 
 buildscript {
     repositories {
@@ -45,20 +44,23 @@ subprojects {
     version = System.getenv("GITHUB_REF")?.substring(10) ?: System.getProperty("GITHUB_REF")?.substring(10) ?: "unknown"
 
     plugins.withType<DokkaPlugin> {
-        tasks.withType<DokkaTask>().configureEach {
+        dokka {
             dokkaSourceSets {
                 configureEach {
-                    if (name.startsWith("ios")) {
-                        displayName.set("ios")
-                    }
-
                     sourceLink {
                         localDirectory.set(rootDir)
-                        remoteUrl.set(URI("https://github.com/appmattus/certificatetransparency/blob/main").toURL())
+                        remoteUrl("https://github.com/appmattus/certificatetransparency/blob/main")
                         remoteLineSuffix.set("#L")
                     }
                 }
             }
+            pluginsConfiguration.html {
+                footerMessage.set(
+                    provider {
+                        "Copyright © 2021-${ZonedDateTime.now().year} Appmattus Limited"
+                    }
+                )
+            }
         }
     }
 
@@ -91,10 +93,6 @@ subprojects {
     }
 }
 
-tasks.register<Delete>("clean") {
-    delete(rootProject.layout.buildDirectory)
-}
-
 apply(from = "$rootDir/gradle/scripts/dependencyUpdates.gradle.kts")
 
 markdownlint {
diff --git a/certificatetransparency-android/.snyk b/certificatetransparency-android/.snyk
@@ -38,6 +38,10 @@ ignore:
     - '*':
         reason: 'Android testing tool, not used in production code'
         created: 2025-02-13T09:16:09.274Z
+  SNYK-JAVA-COMGOOGLEPROTOBUF-8055228:
+    - '*':
+        reason: 'Android testing tool, not used in production code'
+        created: 2025-05-12T22:42:04.168Z
 
   SNYK-JAVA-COMFASTERXMLWOODSTOX-3091135:
     - '*':
diff --git a/certificatetransparency-android/build.gradle.kts b/certificatetransparency-android/build.gradle.kts
@@ -14,7 +14,7 @@ apply(from = "$rootDir/gradle/scripts/jacoco-android.gradle.kts")
 android {
     namespace = "com.appmattus.certificatetransparency"
 
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         minSdk = 19
diff --git a/gradle.properties b/gradle.properties
@@ -19,6 +19,9 @@ org.gradle.jvmargs=-Xmx4g -Xms1g
 android.enableJetifier=true
 android.useAndroidX=true
 
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+
 # https://developer.android.com/studio/releases/gradle-plugin#buildFeatures
 android.defaults.buildfeatures.buildconfig=false
 android.defaults.buildfeatures.aidl=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,52 +17,52 @@
 [versions]
 
 java = "11"
-kotlin = "2.1.10"
+kotlin = "2.1.20"
 
 # Plugins
-androidGradlePlugin = "8.8.0"
-detektGradlePlugin = "1.23.7"
+androidGradlePlugin = "8.10.0"
+detektGradlePlugin = "1.23.8"
 dokkaPlugin = "2.0.0"
-gradleMavenPublishPlugin = "0.30.0"
+gradleMavenPublishPlugin = "0.31.0"
 gradleVersionsPlugin = "0.52.0"
 markdownlintGradlePlugin = "0.6.0"
 
 # Core dependencies
-kotlinx-coroutines = "1.10.1"
-kotlinx-serialization = "1.8.0"
+kotlinx-coroutines = "1.10.2"
+kotlinx-serialization = "1.8.1"
 okhttp = "4.12.0"
-okio = "3.10.2"
+okio = "3.11.0"
 
 # Test dependencies
 androidx-test-core = "1.6.1"
 androidx-test-junit = "1.2.1"
 androidx-test-runner = "1.6.2"
 bouncycastle = "1.80"
 classgraph = "4.8.179"
-equalsverifier = "3.18.1"
-jacoco = "0.8.12"
+equalsverifier = "3.19.3"
+jacoco = "0.8.13"
 junit4 = "4.13.2"
-mockito-core = "5.15.2"
+mockito-core = "5.17.0"
 mockito-kotlin = "5.4.0"
 retrofit = "2.11.0"
 robolectric = "4.14.1"
 
 # Sample app only dependencies
-androidx-activity-compose = "1.10.0"
+androidx-activity-compose = "1.10.1"
 androidx-appcompat = "1.7.0"
-androidx-compose-bom = "2025.01.00"
-androidx-lifecycle-runtime = "2.8.7"
-androidx-lifecycle-viewmodelcompose = "2.8.7"
-androidx-navigation-compose = "2.8.5"
+androidx-compose-bom = "2025.05.00"
+androidx-lifecycle-runtime = "2.9.0"
+androidx-lifecycle-viewmodelcompose = "2.9.0"
+androidx-navigation-compose = "2.9.0"
 google-material = "1.12.0"
-google-playservices = "18.5.0"
+google-playservices = "18.7.0"
 highlightjs = "1.5.0"
 jmustache = "1.16"
 volley = "1.2.1"
 orbit = "9.0.0"
 
 # Core library desugaring
-desugar = "2.1.4"
+desugar = "2.1.5"
 
 
 [libraries]
diff --git a/gradle/scripts/jacoco-android.gradle.kts b/gradle/scripts/jacoco-android.gradle.kts
@@ -52,7 +52,7 @@ val jacocoTask = tasks.register<JacocoReport>("jacocoTestReport") {
     sourceDirectories.setFrom(files(listOf(mainSrc)))
     classDirectories.setFrom(files(listOf(debugTree)))
     executionData.setFrom(
-        fileTree(project.buildDir) {
+        fileTree(rootProject.layout.buildDirectory) {
             include(listOf("jacoco/testDebugUnitTest.exec"))
         }
     )
diff --git a/sampleapp/build.gradle.kts b/sampleapp/build.gradle.kts
@@ -11,11 +11,11 @@ plugins {
 android {
     namespace = "com.appmattus.certificatetransparency.sampleapp"
 
-    compileSdk = 35
+    compileSdk = 36
     defaultConfig {
         applicationId = "com.appmattus.certificatetransparency.sampleapp"
         minSdk = 21
-        targetSdk = 35
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
         proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
diff --git a/sampleapp/src/main/java/com/appmattus/certificatetransparency/sampleapp/ExampleScreen.kt b/sampleapp/src/main/java/com/appmattus/certificatetransparency/sampleapp/ExampleScreen.kt
@@ -18,10 +18,13 @@ package com.appmattus.certificatetransparency.sampleapp
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.items
@@ -96,7 +99,12 @@ fun ExampleScreen(viewModel: BaseExampleViewModel) {
             }
         }
     ) { padding ->
-        LazyColumn(modifier = Modifier.padding(padding).fillMaxHeight()) {
+        LazyColumn(
+            modifier = Modifier
+                .padding(padding)
+                .windowInsetsPadding(WindowInsets.safeDrawing)
+                .fillMaxHeight()
+        ) {
             item { Spacer(modifier = Modifier.height(8.dp)) }
 
             item {
diff --git a/sampleapp/src/main/java/com/appmattus/certificatetransparency/sampleapp/MainScreen.kt b/sampleapp/src/main/java/com/appmattus/certificatetransparency/sampleapp/MainScreen.kt
@@ -16,11 +16,10 @@
 
 package com.appmattus.certificatetransparency.sampleapp
 
-import android.net.Uri
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeContent
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.Scaffold
@@ -29,6 +28,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
 import androidx.navigation.NavController
 import com.appmattus.certificatetransparency.sampleapp.item.AppmattusLogo
 import com.appmattus.certificatetransparency.sampleapp.item.ExampleCardItem
@@ -45,7 +45,7 @@ fun MainScreen(navController: NavController) {
         LazyColumn(
             modifier = Modifier
                 .padding(padding)
-                .windowInsetsPadding(WindowInsets.safeContent)
+                .windowInsetsPadding(WindowInsets.safeDrawing)
                 .padding(vertical = 8.dp)
                 .fillMaxHeight()
         ) {
@@ -60,7 +60,7 @@ fun MainScreen(navController: NavController) {
                 ExampleCardItem(
                     scaffoldState = scaffoldState,
                     title = stringResource(R.string.okhttp),
-                    moreInfoUri = Uri.parse("https://square.github.io/okhttp/"),
+                    moreInfoUri = "https://square.github.io/okhttp/".toUri(),
                     onKotlinClick = { navController.navigate("okhttp/kotlin") },
                     onJavaClick = { navController.navigate("okhttp/java") },
                     modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
@@ -70,7 +70,7 @@ fun MainScreen(navController: NavController) {
                 ExampleCardItem(
                     scaffoldState = scaffoldState,
                     title = stringResource(R.string.httpurlconnection),
-                    moreInfoUri = Uri.parse("https://developer.android.com/reference/java/net/HttpURLConnection"),
+                    moreInfoUri = "https://developer.android.com/reference/java/net/HttpURLConnection".toUri(),
                     onKotlinClick = { navController.navigate("httpurlconnection/kotlin") },
                     onJavaClick = { navController.navigate("httpurlconnection/java") },
                     modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
@@ -80,7 +80,7 @@ fun MainScreen(navController: NavController) {
                 ExampleCardItem(
                     scaffoldState = scaffoldState,
                     title = stringResource(R.string.volley),
-                    moreInfoUri = Uri.parse("https://developer.android.com/training/volley/index.html"),
+                    moreInfoUri = "https://developer.android.com/training/volley/index.html".toUri(),
                     onKotlinClick = { navController.navigate("volley/kotlin") },
                     onJavaClick = { navController.navigate("volley/java") },
                     modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
@@ -90,7 +90,7 @@ fun MainScreen(navController: NavController) {
                 ExampleCardItem(
                     scaffoldState = scaffoldState,
                     title = stringResource(R.string.trust_manager),
-                    moreInfoUri = Uri.parse("https://developer.android.com/reference/javax/net/ssl/X509TrustManager"),
+                    moreInfoUri = "https://developer.android.com/reference/javax/net/ssl/X509TrustManager".toUri(),
                     onKotlinClick = { navController.navigate("trustmanager/kotlin") },
                     onJavaClick = { navController.navigate("trustmanager/java") },
                     modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
@@ -108,7 +108,7 @@ fun MainScreen(navController: NavController) {
             }
 
             item {
-                AppmattusLogo(modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp))
+                AppmattusLogo(modifier = Modifier.padding(horizontal = 64.dp, vertical = 32.dp))
             }
         }
     }
diff --git a/sampleapp/src/main/java/com/appmattus/certificatetransparency/sampleapp/WebViewScreen.kt b/sampleapp/src/main/java/com/appmattus/certificatetransparency/sampleapp/WebViewScreen.kt
@@ -23,7 +23,7 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeContent
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.Scaffold
@@ -78,7 +78,7 @@ fun WebViewScreen(viewModel: WebViewExampleViewModel) {
         LazyColumn(
             modifier = Modifier
                 .padding(padding)
-                .windowInsetsPadding(WindowInsets.safeContent)
+                .windowInsetsPadding(WindowInsets.safeDrawing)
                 .fillMaxHeight()
         ) {
             item { Spacer(modifier = Modifier.height(8.dp)) }
diff --git a/sampleapp/src/main/java/com/appmattus/certificatetransparency/sampleapp/item/AppmattusLogo.kt b/sampleapp/src/main/java/com/appmattus/certificatetransparency/sampleapp/item/AppmattusLogo.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Appmattus Limited
+ * Copyright 2021-2025 Appmattus Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,21 +20,21 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import com.appmattus.certificatetransparency.sampleapp.R
 
 @Composable
 fun AppmattusLogo(modifier: Modifier = Modifier) {
     Row(modifier = modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
         Image(
-            painter = painterResource(R.drawable.ic_appmattus_logo),
+            painter = painterResource(R.drawable.appmattus_logo_light),
             contentDescription = "Appmattus Limited",
-            modifier = Modifier.width(200.dp)
+            contentScale = ContentScale.FillWidth,
+            modifier = Modifier.fillMaxWidth()
         )
     }
 }
diff --git a/sampleapp/src/main/java/com/appmattus/certificatetransparency/sampleapp/item/ExampleCardItem.kt b/sampleapp/src/main/java/com/appmattus/certificatetransparency/sampleapp/item/ExampleCardItem.kt
@@ -47,6 +47,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import com.appmattus.certificatetransparency.sampleapp.R
 import kotlinx.coroutines.launch
 
@@ -136,7 +137,7 @@ fun PreviewExampleCardItem() {
     ExampleCardItem(
         scaffoldState = rememberScaffoldState(),
         title = "OkHttp",
-        moreInfoUri = Uri.parse("https://example.com/"),
+        moreInfoUri = "https://example.com/".toUri(),
         onKotlinClick = {},
         onJavaClick = {}
     )
diff --git a/sampleapp/src/main/res/drawable/appmattus_logo_light.xml b/sampleapp/src/main/res/drawable/appmattus_logo_light.xml
@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="200dp"
+    android:height="39.4dp"
+    android:viewportWidth="200"
+    android:viewportHeight="39.4">
+  <path
+      android:pathData="M16.2,7.6L21,7.6v20.6h-4.8L16.2,26a9.2,9.2 0,0 1,-13.4 -0.3A11.5,11.5 0,0 1,0 17.8c0,-3 1,-5.6 2.8,-7.7a9,9 0,0 1,13.4 -0.1L16.2,7.6ZM4.9,17.8c0,2 0.5,3.6 1.6,4.9 1,1.2 2.4,1.8 4,1.8 1.8,0 3.3,-0.6 4.4,-1.8a7,7 0,0 0,1.6 -4.8,7 7,0 0,0 -1.6,-4.8 5.4,5.4 0,0 0,-4.3 -1.8c-1.6,0 -3,0.6 -4,1.9a6.9,6.9 0,0 0,-1.7 4.6ZM31.8,39.4L27,39.4L27,7.6h4.8v2.2C33.6,8 35.8,7 38.2,7a9,9 0,0 1,7 3.1C47,12.2 48,14.8 48,18c0,3 -1,5.7 -2.8,7.7a9,9 0,0 1,-7 3.1c-2.4,0 -4.5,-1 -6.4,-2.9v13.5ZM43,18c0,-2 -0.5,-3.6 -1.6,-4.8a5.2,5.2 0,0 0,-4.1 -1.9c-1.8,0 -3.2,0.6 -4.3,1.8a7,7 0,0 0,-1.6 4.8,7 7,0 0,0 1.6,4.8c1,1.2 2.5,1.8 4.3,1.8 1.6,0 3,-0.6 4,-1.8a6.8,6.8 0,0 0,1.7 -4.7ZM57.7,39.4L53,39.4L53,7.6h4.8v2.2C59.7,8 61.8,7 64.2,7a9,9 0,0 1,7 3.1C73,12.2 74,14.8 74,18c0,3 -1,5.7 -2.8,7.7a9,9 0,0 1,-7 3.1c-2.4,0 -4.5,-1 -6.4,-2.9v13.5ZM69,18c0,-2 -0.5,-3.6 -1.6,-4.8a5.2,5.2 0,0 0,-4.1 -1.9c-1.8,0 -3.2,0.6 -4.3,1.8a7,7 0,0 0,-1.6 4.8,7 7,0 0,0 1.6,4.8c1.1,1.2 2.5,1.8 4.3,1.8 1.6,0 3,-0.6 4,-1.8a6.8,6.8 0,0 0,1.7 -4.7Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="37.01"
+          android:startY="5.54"
+          android:endX="37.01"
+          android:endY="39.56"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF040404"/>
+        <item android:offset="1" android:color="#FF404040"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M79,7.6h4.7v1.9c1,-1 1.7,-1.6 2.4,-2 0.7,-0.3 1.5,-0.5 2.6,-0.5 2.3,0 4.1,1 5.5,3 1.5,-2 3.5,-3 6,-3 4.7,0 7,2.8 7,8.4v12.8h-4.7L102.5,16.7c0,-2 -0.3,-3.3 -0.8,-4.2 -0.4,-0.8 -1.3,-1.2 -2.4,-1.2 -1.3,0 -2.3,0.5 -2.9,1.5 -0.6,1 -0.9,2.6 -0.9,4.7v10.7h-4.7L90.8,16.8c0,-3.7 -1.1,-5.5 -3.2,-5.5 -1.4,0 -2.3,0.5 -3,1.5 -0.6,1 -0.9,2.6 -0.9,4.7v10.7L79,28.2L79,7.6ZM128.5,7.6h4.8v20.6h-4.8L128.5,26a9.1,9.1 0,0 1,-13.4 -0.3,11.5 11.5,0 0,1 -2.8,-7.9c0,-3 1,-5.7 2.8,-7.7a9,9 0,0 1,13.4 -0.1L128.5,7.6ZM117.2,17.8c0,2 0.5,3.6 1.6,4.9 1,1.2 2.4,1.8 4,1.8 1.8,0 3.3,-0.6 4.4,-1.8a7,7 0,0 0,1.6 -4.8,7 7,0 0,0 -1.6,-4.8 5.4,5.4 0,0 0,-4.3 -1.8c-1.6,0 -3,0.6 -4,1.9a6.9,6.9 0,0 0,-1.7 4.6ZM144.2,12v16.2h-4.8L139.4,12h-2L137.4,7.6h2L139.4,0h4.8v7.6h3.7L147.9,12h-3.7ZM156.1,12v16.2h-4.8L151.3,12h-2L149.3,7.6h2L151.3,0h4.8v7.6h3.7L159.8,12L156,12ZM167.8,7.6v11.8c0,3.4 1.3,5.1 4,5.1s4,-1.7 4,-5v-12h4.9v12c0,1.7 -0.3,3 -0.7,4.3 -0.4,1 -1,2 -2,2.9a9,9 0,0 1,-6.2 2.1,9 9,0 0,1 -6,-2.1c-1,-0.9 -1.8,-1.8 -2.2,-2.9 -0.4,-1 -0.6,-2.4 -0.6,-4.3v-12h4.8ZM198.7,11.1 L194.7,13.1c-0.6,-1.2 -1.4,-1.8 -2.3,-1.8 -0.4,0 -0.8,0.1 -1.1,0.4 -0.3,0.3 -0.5,0.7 -0.5,1.1 0,0.8 1,1.6 2.8,2.4 2.5,1 4.2,2 5,3 1,0.9 1.4,2.1 1.4,3.7 0,2 -0.7,3.6 -2.2,5a7.5,7.5 0,0 1,-5.2 1.9c-3.4,0 -5.9,-1.7 -7.3,-5l4,-2 1.3,2a3,3 0,0 0,2.1 0.7c1.6,0 2.4,-0.7 2.4,-2.2 0,-0.8 -0.6,-1.6 -1.8,-2.3a67.9,67.9 0,0 0,-3 -1.4,9 9,0 0,1 -2.9,-2 5,5 0,0 1,-1 -3.4c0,-1.8 0.6,-3.3 1.8,-4.4a6.5,6.5 0,0 1,4.6 -1.8c2.6,0 4.6,1.4 5.9,4Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="138.56"
+          android:startY="-0.83"
+          android:endX="138.56"
+          android:endY="29.74"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF015AA3"/>
+        <item android:offset="1" android:color="#FF2A8CD3"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M102.4,38.7h1.8v-0.2c-0.6,0 -0.7,-0.1 -0.7,-0.6v-5.7l-1.1,0.4v0.1c0.6,0 0.6,0 0.6,0.6v4.6c0,0.5 0,0.6 -0.6,0.6v0.2ZM113.9,32.9c-0.2,0 -0.3,0.1 -0.3,0.4 0,0.3 0.1,0.5 0.3,0.5 0.2,0 0.4,-0.2 0.4,-0.5 0,-0.2 -0.1,-0.4 -0.4,-0.4ZM114.2,34.4c-0.4,0.2 -0.6,0.3 -1.1,0.3v0.2c0.6,0 0.6,0 0.6,0.6v2.4c0,0.5 0,0.6 -0.6,0.6v0.2h1.8v-0.2c-0.6,0 -0.7,-0.1 -0.7,-0.6v-3.5ZM127.2,35.1c0,-0.4 -0.4,-0.7 -1,-0.7s-1,0.3 -1.4,0.7v-0.7h-0.1a2,2 0,0 1,-1 0.3v0.2c0.6,0 0.6,0 0.6,0.6v2.4c0,0.5 0,0.6 -0.5,0.6v0.2h1.5v-0.2c-0.4,0 -0.5,0 -0.5,-0.6v-2.4c0.5,-0.5 0.8,-0.9 1.2,-0.9 0.8,0 0.8,1 0.8,1.3v2c0,0.5 0,0.6 -0.5,0.6v0.2h1.6v-0.2c-0.5,0 -0.5,0 -0.5,-0.6v-2.4c0.3,-0.5 0.7,-0.9 1.2,-0.9 0.7,0 0.8,0.9 0.8,1.3v2c0,0.5 -0.1,0.6 -0.5,0.6v0.2h1.5v-0.2c-0.5,0 -0.5,0 -0.5,-0.6v-2c0,-0.7 -0.1,-1 -0.3,-1.2 -0.3,-0.3 -0.6,-0.3 -1,-0.3 -0.5,0 -1,0.3 -1.3,0.7ZM140.2,32.9c-0.3,0 -0.4,0.1 -0.4,0.4 0,0.3 0.1,0.5 0.3,0.5 0.2,0 0.4,-0.2 0.4,-0.5 0,-0.2 -0.2,-0.4 -0.4,-0.4ZM140.4,34.4c-0.4,0.2 -0.6,0.3 -1.1,0.3v0.2c0.6,0 0.6,0 0.6,0.6v2.4c0,0.5 0,0.6 -0.6,0.6v0.2h1.7v-0.2c-0.5,0 -0.6,-0.1 -0.6,-0.6v-3.5ZM150.4,34.7v3.1c0,0.8 0.6,1 1,1s0.7,-0.1 1,-0.4l-0.1,-0.2c-0.3,0.2 -0.5,0.3 -0.8,0.3 -0.3,0 -0.5,-0.3 -0.5,-0.7v-3h1.2v-0.3L151,34.5v-1.2h-0.2c-0.2,0.9 -0.3,1.2 -1,1.2v0.2h0.7ZM164.4,37.7c0,0.3 -0.5,0.8 -1.3,0.8 -0.4,0 -1.3,-0.2 -1.3,-2h2.9c0,-1 -0.4,-2.1 -1.7,-2.1 -1.2,0 -1.8,1 -1.8,2 0,1.2 0.4,2.4 2,2.4 0.4,0 1,-0.2 1.5,-1l-0.2,-0.1ZM161.8,36.2c0,-1.4 0.8,-1.6 1.2,-1.6 1,0 1.2,1 1.2,1.6h-2.4ZM176.8,34.8c-0.1,-0.2 -0.5,-0.4 -1,-0.4 -1.4,0 -2,1 -2,2 0,2.2 1.3,2.4 1.8,2.4 0.7,0 1.1,-0.3 1.3,-0.6v0.5h1.1v-0.2c-0.5,0 -0.6,0 -0.6,-0.5v-5.8l-1,0.4v0.1c0.5,0 0.5,0.1 0.5,0.6v1.5ZM176.9,37.8c-0.3,0.4 -0.7,0.7 -1.2,0.7 -0.8,0 -1.3,-0.8 -1.3,-2 0,-0.6 0.1,-1 0.3,-1.4 0.3,-0.3 0.7,-0.5 1,-0.5 0.5,0 1,0.3 1.2,0.7v2.5Z"/>
+</vector>
diff --git a/sampleapp/src/main/res/drawable/ic_appmattus_logo.xml b/sampleapp/src/main/res/drawable/ic_appmattus_logo.xml

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ val jacocoTask = tasks.register<JacocoReport>("jacocoTestReport") {`
`52`	`52`	`sourceDirectories.setFrom(files(listOf(mainSrc)))`
`53`	`53`	`classDirectories.setFrom(files(listOf(debugTree)))`
`54`	`54`	`executionData.setFrom(`
`55`		`- fileTree(project.buildDir) {`
	`55`	`+ fileTree(rootProject.layout.buildDirectory) {`
`56`	`56`	`include(listOf("jacoco/testDebugUnitTest.exec"))`
`57`	`57`	`}`
`58`	`58`	`)`