From 11d102705998bf2ac884305216a4bc11f83fdd5e Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Mon, 8 Jun 2026 16:39:45 +0200 Subject: [PATCH 1/2] chore(build): update Signed-off-by: alperozturk96 --- app/build.gradle | 13 +++++++------ gradle.properties | 9 ++------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d5c3758f3..627b86341 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,14 +8,13 @@ */ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' android { namespace = 'it.niedermann.owncloud.notes' defaultConfig { applicationId "it.niedermann.owncloud.notes" - minSdk 24 + minSdk 28 compileSdk = 36 targetSdk 36 versionCode 340100050 @@ -30,12 +29,14 @@ android { compileOptions { coreLibraryDesugaringEnabled = true - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } - kotlinOptions { - jvmTarget = '17' + kotlin { + jvmToolchain { + languageVersion.set(JavaLanguageVersion.of(21)) + } } buildFeatures { diff --git a/gradle.properties b/gradle.properties index 45a1a2d43..4619f216c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,23 +3,18 @@ # SPDX-FileCopyrightText: 2024 Andy Scherzinger # SPDX-License-Identifier: GPL-3.0-or-later android.useAndroidX=true -org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g +org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g org.gradle.dependency.verification.console=verbose -kotlin.daemon.jvmargs=-Xmx6144m -XX:+UseParallelGC +kotlin.daemon.jvmargs=-Xmx3072m -XX:+UseParallelGC org.gradle.caching=true org.gradle.parallel=true org.gradle.configureondemand=true kapt.incremental.apt=true org.gradle.daemon=true org.gradle.configuration-cache=true -android.defaults.buildfeatures.resvalues=true -android.sdk.defaultTargetSdkToCompileSdkIfUnset=false android.enableAppCompileTimeRClass=false -android.usesSdkInManifest.disallowed=false android.uniquePackageNames=false android.dependency.useConstraints=true android.r8.strictFullModeForKeepRules=false android.r8.optimizedResourceShrinking=false -android.builtInKotlin=false -android.newDsl=false From 5232ba87210cd37ca807cb6984f3bc081c4525ca Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 9 Jun 2026 10:37:15 +0200 Subject: [PATCH 2/2] fix Caused by: android.content.pm.PackageParser$PackageParserException at PackageParser.java:935 Signed-off-by: alperozturk96 --- .../it/niedermann/owncloud/notes/main/MainViewModelTest.java | 2 ++ .../owncloud/notes/main/items/grid/GridItemDecorationTest.java | 2 ++ .../niedermann/owncloud/notes/main/slots/SlotterUtilTest.java | 2 ++ .../niedermann/owncloud/notes/persistence/AccountDaoTest.java | 2 ++ .../niedermann/owncloud/notes/persistence/ApiProviderTest.java | 2 ++ .../owncloud/notes/persistence/CapabilitiesClientTest.java | 2 ++ .../it/niedermann/owncloud/notes/persistence/NotesDaoTest.java | 2 ++ .../owncloud/notes/persistence/NotesRepositoryTest.java | 1 + .../owncloud/notes/persistence/NotesServerSyncTaskTest.java | 2 ++ .../notes/persistence/sync/CapabilitiesDeserializerTest.java | 2 ++ .../owncloud/notes/persistence/util/NotesColorUtilTest.java | 2 ++ .../owncloud/notes/shared/util/ApiVersionUtilTest.java | 2 ++ .../it/niedermann/owncloud/notes/shared/util/NoteUtilTest.kt | 1 + 13 files changed, 24 insertions(+) diff --git a/app/src/test/java/it/niedermann/owncloud/notes/main/MainViewModelTest.java b/app/src/test/java/it/niedermann/owncloud/notes/main/MainViewModelTest.java index 9baeed02a..f8f3cdea9 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/main/MainViewModelTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/main/MainViewModelTest.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -34,6 +35,7 @@ import it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType; @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class MainViewModelTest { @Rule diff --git a/app/src/test/java/it/niedermann/owncloud/notes/main/items/grid/GridItemDecorationTest.java b/app/src/test/java/it/niedermann/owncloud/notes/main/items/grid/GridItemDecorationTest.java index 7a299f363..6ad94d32e 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/main/items/grid/GridItemDecorationTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/main/items/grid/GridItemDecorationTest.java @@ -24,12 +24,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import java.util.Arrays; import it.niedermann.owncloud.notes.main.items.ItemAdapter; @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class GridItemDecorationTest { private final ItemAdapter itemAdapter = mock(ItemAdapter.class); diff --git a/app/src/test/java/it/niedermann/owncloud/notes/main/slots/SlotterUtilTest.java b/app/src/test/java/it/niedermann/owncloud/notes/main/slots/SlotterUtilTest.java index 15a1180ee..860b40c46 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/main/slots/SlotterUtilTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/main/slots/SlotterUtilTest.java @@ -13,6 +13,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import java.util.Calendar; import java.util.List; @@ -21,6 +22,7 @@ import it.niedermann.owncloud.notes.persistence.entity.Note; @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class SlotterUtilTest { @Test diff --git a/app/src/test/java/it/niedermann/owncloud/notes/persistence/AccountDaoTest.java b/app/src/test/java/it/niedermann/owncloud/notes/persistence/AccountDaoTest.java index 680a46216..311ea50f6 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/persistence/AccountDaoTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/persistence/AccountDaoTest.java @@ -20,11 +20,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import it.niedermann.owncloud.notes.persistence.entity.Account; import it.niedermann.owncloud.notes.shared.model.Capabilities; @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class AccountDaoTest { @Rule diff --git a/app/src/test/java/it/niedermann/owncloud/notes/persistence/ApiProviderTest.java b/app/src/test/java/it/niedermann/owncloud/notes/persistence/ApiProviderTest.java index 97893db08..0a091f4e0 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/persistence/ApiProviderTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/persistence/ApiProviderTest.java @@ -16,6 +16,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import it.niedermann.owncloud.notes.persistence.sync.NotesAPI; import it.niedermann.owncloud.notes.persistence.sync.OcsAPI; @@ -26,6 +27,7 @@ import static org.junit.Assert.assertSame; @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class ApiProviderTest { @Rule diff --git a/app/src/test/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClientTest.java b/app/src/test/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClientTest.java index 161529fc4..f32597ea9 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClientTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClientTest.java @@ -19,6 +19,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import java.io.IOException; import java.util.Map; @@ -39,6 +40,7 @@ import static org.mockito.Mockito.when; @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class CapabilitiesClientTest { @Rule diff --git a/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesDaoTest.java b/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesDaoTest.java index e9fecf869..8ebdc3c79 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesDaoTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesDaoTest.java @@ -19,6 +19,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import java.util.Calendar; import java.util.List; @@ -39,6 +40,7 @@ import static org.junit.Assert.assertTrue; @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class NotesDaoTest { @Rule diff --git a/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesRepositoryTest.java b/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesRepositoryTest.java index 11320943c..13412cafa 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesRepositoryTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesRepositoryTest.java @@ -66,6 +66,7 @@ import it.niedermann.owncloud.notes.shared.model.IResponseCallback; @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class NotesRepositoryTest { @Rule diff --git a/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTaskTest.java b/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTaskTest.java index 00eef05d9..23fad3b58 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTaskTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTaskTest.java @@ -30,6 +30,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import java.io.IOException; import java.util.Arrays; @@ -44,6 +45,7 @@ @SuppressWarnings("CallToThreadRun") @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class NotesServerSyncTaskTest { @Rule diff --git a/app/src/test/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializerTest.java b/app/src/test/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializerTest.java index 69b28290e..8c45c9f21 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializerTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializerTest.java @@ -18,8 +18,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class CapabilitiesDeserializerTest { private final CapabilitiesDeserializer deserializer = new CapabilitiesDeserializer(); diff --git a/app/src/test/java/it/niedermann/owncloud/notes/persistence/util/NotesColorUtilTest.java b/app/src/test/java/it/niedermann/owncloud/notes/persistence/util/NotesColorUtilTest.java index f89f444fc..c04927901 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/persistence/util/NotesColorUtilTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/persistence/util/NotesColorUtilTest.java @@ -16,12 +16,14 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import java.util.ArrayList; import it.niedermann.owncloud.notes.shared.util.NotesColorUtil; @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class NotesColorUtilTest { @Test public void testContrastRatioIsSufficient() { diff --git a/app/src/test/java/it/niedermann/owncloud/notes/shared/util/ApiVersionUtilTest.java b/app/src/test/java/it/niedermann/owncloud/notes/shared/util/ApiVersionUtilTest.java index 02c1c0355..198a39427 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/shared/util/ApiVersionUtilTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/shared/util/ApiVersionUtilTest.java @@ -11,6 +11,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import java.util.Arrays; import java.util.Collection; @@ -20,6 +21,7 @@ import it.niedermann.owncloud.notes.shared.model.ApiVersion; @RunWith(RobolectricTestRunner.class) +@Config(sdk = 36) public class ApiVersionUtilTest extends TestCase { @Test diff --git a/app/src/test/java/it/niedermann/owncloud/notes/shared/util/NoteUtilTest.kt b/app/src/test/java/it/niedermann/owncloud/notes/shared/util/NoteUtilTest.kt index b45f1288a..ed2495f92 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/shared/util/NoteUtilTest.kt +++ b/app/src/test/java/it/niedermann/owncloud/notes/shared/util/NoteUtilTest.kt @@ -19,6 +19,7 @@ import org.robolectric.annotation.Config * Tests the NoteUtil. */ @RunWith(RobolectricTestRunner::class) +@Config(sdk = [36]) class NoteUtilTest : TestCase() { companion object {