Merge pull request #3223 from nextcloud/chore/align-with-files

chore(build): update

Author: tobiasKaminsky

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 {

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

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);

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

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

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

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

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

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

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