diff --git a/bank-sdk/example-app/build.gradle.kts b/bank-sdk/example-app/build.gradle.kts index ef0563b7d2..33fcb6e251 100644 --- a/bank-sdk/example-app/build.gradle.kts +++ b/bank-sdk/example-app/build.gradle.kts @@ -11,6 +11,7 @@ plugins { id("kotlin-parcelize") id("androidx.navigation.safeargs.kotlin") id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0" + alias(libs.plugins.compose.compiler) } // TODO: construct version code and name in fastlane and inject them @@ -142,11 +143,11 @@ android { } } compileOptions { - sourceCompatibility(JavaVersion.VERSION_1_8) - targetCompatibility(JavaVersion.VERSION_1_8) + sourceCompatibility(JavaVersion.VERSION_17) + targetCompatibility(JavaVersion.VERSION_17) } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } sourceSets { getByName("debug") { @@ -156,12 +157,16 @@ android { testOptions { execution = "ANDROIDX_TEST_ORCHESTRATOR" } + lint { + checkDependencies = true + } + } // after upgrading to AGP 8, we need this, otherwise, gradle will complain to use the same jdk version as your machine (17 which is bundled with Android Studio) // https://youtrack.jetbrains.com/issue/KT-55947/Unable-to-set-kapt-jvm-target-version tasks.withType(type = org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask::class) { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() } dependencies { diff --git a/bank-sdk/sdk/build.gradle.kts b/bank-sdk/sdk/build.gradle.kts index 59c603198e..07ae73d16a 100644 --- a/bank-sdk/sdk/build.gradle.kts +++ b/bank-sdk/sdk/build.gradle.kts @@ -9,6 +9,8 @@ plugins { id("kotlin-parcelize") id("jacoco") id("androidx.navigation.safeargs.kotlin") + alias(libs.plugins.compose.compiler) + } jacoco { diff --git a/build.gradle.kts b/build.gradle.kts index 1c96c23109..46794966c9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,6 +3,10 @@ import net.gini.gradle.ReleaseOrderPlugin import net.gini.gradle.DependencyUpdatesPlugin +plugins { + alias(libs.plugins.compose.compiler) apply false +} + buildscript { repositories { google() diff --git a/capture-sdk/sdk/build.gradle.kts b/capture-sdk/sdk/build.gradle.kts index 3960cc2c2b..fc110725e4 100644 --- a/capture-sdk/sdk/build.gradle.kts +++ b/capture-sdk/sdk/build.gradle.kts @@ -8,6 +8,7 @@ plugins { id("kotlin-parcelize") id("jacoco") id("androidx.navigation.safeargs") + alias(libs.plugins.compose.compiler) } jacoco { diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentImplTest.java b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentImplTest.java index 493c4bd01c..1b09fab279 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentImplTest.java +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentImplTest.java @@ -1,19 +1,5 @@ package net.gini.android.capture.analysis; -import static androidx.test.espresso.Espresso.onView; -import static androidx.test.espresso.assertion.ViewAssertions.matches; -import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static androidx.test.espresso.matcher.ViewMatchers.withId; -import static androidx.test.espresso.matcher.ViewMatchers.withText; -import static com.google.common.truth.Truth.assertThat; -import static net.gini.android.capture.analysis.BitmapMatcher.withBitmap; -import static net.gini.android.capture.analysis.RotationMatcher.withRotation; -import static net.gini.android.capture.test.Helpers.getTestJpeg; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; - import android.app.Activity; import android.app.Dialog; import android.content.DialogInterface; @@ -33,10 +19,10 @@ import net.gini.android.capture.document.ImageDocument; import net.gini.android.capture.internal.camera.photo.Photo; import net.gini.android.capture.internal.camera.photo.PhotoFactory; +import net.gini.android.capture.internal.util.CancelListener; import net.gini.android.capture.internal.util.Size; import net.gini.android.capture.network.GiniCaptureNetworkService; import net.gini.android.capture.test.FragmentImplFactory; -import net.gini.android.capture.internal.util.CancelListener; import net.gini.android.capture.view.DefaultLoadingIndicatorAdapter; import org.junit.After; @@ -51,18 +37,34 @@ import jersey.repackaged.jsr166e.CompletableFuture; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; +import static com.google.common.truth.Truth.assertThat; +import static net.gini.android.capture.analysis.BitmapMatcher.withBitmap; +import static net.gini.android.capture.analysis.RotationMatcher.withRotation; +import static net.gini.android.capture.test.Helpers.getTestJpeg; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + /** * Created by Alpar Szotyori on 15.05.2019. - * + *

* Copyright (c) 2019 Gini GmbH. */ @RunWith(AndroidJUnit4.class) +//TODO: remove the maxSdk after upgrading to robolectric to 4.16 @Config(shadows = { AnalysisFragmentImplTest.DialogShadow.class, AnalysisFragmentImplTest.AnalysisHintsAnimatorShadow.class, AnalysisFragmentImplTest.DefaultLoadingIndicatorAdapterShadow.class -}) +}, + maxSdk = 35) public class AnalysisFragmentImplTest { @After @@ -123,8 +125,8 @@ public void onCancelFlow() { @Override void createPresenter(@NonNull final Activity activity, - @NonNull final Document document, - final String documentAnalysisErrorMessage) { + @NonNull final Document document, + final String documentAnalysisErrorMessage) { setPresenter(presenter); } @@ -572,9 +574,13 @@ static void cleanup() { } @Implementation - public void onVisible() { isOnVisibleCalled = true; } + public void onVisible() { + isOnVisibleCalled = true; + } @Implementation - public void onHidden() { isOnHiddenCalled = true; } + public void onHidden() { + isOnHiddenCalled = true; + } } } diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentTest.kt index f41293f9b2..606795459e 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisFragmentTest.kt @@ -21,6 +21,7 @@ import net.gini.android.capture.tracking.EventTracker import net.gini.android.capture.tracking.useranalytics.UserAnalytics import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config /** * Created by Alpar Szotyori on 02.03.2020. @@ -29,6 +30,10 @@ import org.junit.runner.RunWith */ @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class AnalysisFragmentTest { @Test diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisScreenPresenterTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisScreenPresenterTest.kt index 2302ebcb17..1493fe8456 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisScreenPresenterTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisScreenPresenterTest.kt @@ -31,6 +31,7 @@ import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.anyInt import org.mockito.Mock import org.mockito.MockitoAnnotations +import org.robolectric.annotation.Config import java.util.* import java.util.concurrent.CancellationException @@ -40,6 +41,10 @@ import java.util.concurrent.CancellationException * Copyright (c) 2019 Gini GmbH. */ @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class AnalysisScreenPresenterTest { @Mock private lateinit var mActivity: Activity diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentImplTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentImplTest.kt index 0fd65844c1..a85d3ea87d 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentImplTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentImplTest.kt @@ -24,6 +24,7 @@ import net.gini.android.capture.tracking.EventTracker import net.gini.android.capture.tracking.useranalytics.UserAnalyticsEventTracker import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config /** * Created by Alpar Szotyori on 02.03.2020. @@ -32,6 +33,10 @@ import org.junit.runner.RunWith */ @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class CameraFragmentImplTest { @Test diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentTest.kt index 2cba96749c..99763e8e4a 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/camera/CameraFragmentTest.kt @@ -19,6 +19,7 @@ import net.gini.android.capture.tracking.EventTracker import net.gini.android.capture.tracking.useranalytics.UserAnalytics import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config /** * Created by Alpar Szotyori on 02.03.2020. @@ -27,6 +28,10 @@ import org.junit.runner.RunWith */ @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class CameraFragmentTest { @Test diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/help/HelpFragmentTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/help/HelpFragmentTest.kt index 88e6d74659..b0bff67508 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/help/HelpFragmentTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/help/HelpFragmentTest.kt @@ -17,8 +17,13 @@ import net.gini.android.capture.GiniCapture import net.gini.android.capture.R import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class HelpFragmentTest { @Test diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifReaderTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifReaderTest.kt index dfe89401d7..f8f4958456 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifReaderTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifReaderTest.kt @@ -5,8 +5,13 @@ import com.google.common.truth.Truth import net.gini.android.capture.test.Helpers import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class ExifReaderTest { @Test diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifTest.kt index d1aeec75c9..d49d8aa90b 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifTest.kt @@ -12,10 +12,15 @@ import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config import java.nio.charset.Charset import java.util.Arrays @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class ExifTest { @Test diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifUserCommentBuilderTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifUserCommentBuilderTest.kt index 76a2c9c45b..14760bc99b 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifUserCommentBuilderTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/ExifUserCommentBuilderTest.kt @@ -10,8 +10,13 @@ import net.gini.android.capture.internal.camera.photo.ExifUserCommentHelper.Comp import org.junit.After import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class ExifUserCommentBuilderTest { @After diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/PhotoEditTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/PhotoEditTest.kt index 589cb38ed9..f2f6fc0be8 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/PhotoEditTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/PhotoEditTest.kt @@ -11,11 +11,16 @@ import net.gini.android.capture.test.Helpers import net.gini.android.capture.test.PhotoSubject import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config import java.io.IOException import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class PhotoEditTest { @Test diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/PhotoTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/PhotoTest.kt index e7201760c5..19b04ea087 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/PhotoTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/camera/photo/PhotoTest.kt @@ -11,10 +11,15 @@ import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config import java.io.IOException import java.util.UUID @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class PhotoTest { @Before @Throws(IOException::class) diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/qrcode/EPC069_12ParserTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/qrcode/EPC069_12ParserTest.kt index 27021077ee..471cf7d5e4 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/qrcode/EPC069_12ParserTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/qrcode/EPC069_12ParserTest.kt @@ -5,8 +5,13 @@ import com.google.common.truth.Truth import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class EPC06912ParserTest { private lateinit var parser: EPC069_12Parser diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/storage/ImageDiskStoreTest.java b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/storage/ImageDiskStoreTest.java index 2c8911eb2f..bf084fce23 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/storage/ImageDiskStoreTest.java +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/storage/ImageDiskStoreTest.java @@ -1,21 +1,12 @@ package net.gini.android.capture.internal.storage; -import static com.google.common.truth.Truth.assertThat; - -import static net.gini.android.capture.test.Helpers.copyAssetToStorage; -import static net.gini.android.capture.test.Helpers.getTestJpeg; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.spy; -import static org.robolectric.Shadows.shadowOf; - -import static androidx.test.core.app.ApplicationProvider.getApplicationContext; - import android.app.Application; import android.content.ContentResolver; import android.net.Uri; import android.webkit.MimeTypeMap; +import androidx.test.ext.junit.runners.AndroidJUnit4; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; @@ -29,7 +20,13 @@ import java.io.IOException; import java.util.UUID; -import androidx.test.ext.junit.runners.AndroidJUnit4; +import static androidx.test.core.app.ApplicationProvider.getApplicationContext; +import static com.google.common.truth.Truth.assertThat; +import static net.gini.android.capture.test.Helpers.copyAssetToStorage; +import static net.gini.android.capture.test.Helpers.getTestJpeg; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.spy; +import static org.robolectric.Shadows.shadowOf; /** * Created by Alpar Szotyori on 04.07.2019. @@ -37,10 +34,12 @@ * Copyright (c) 2019 Gini GmbH. */ @RunWith(AndroidJUnit4.class) +//TODO: remove the maxSdk after upgrading to robolectric to 4.16 @Config(shadows = { ImageDiskStoreTest.ContentResolverShadow.class, ImageDiskStoreTest.MimeTypeMapShadow.class -}) +}, +maxSdk = 35) public class ImageDiskStoreTest { @Test diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/textrecognition/CropToCameraFrameTextRecognizerTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/textrecognition/CropToCameraFrameTextRecognizerTest.kt index 2c2e4fa73e..9d86355a4c 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/textrecognition/CropToCameraFrameTextRecognizerTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/internal/textrecognition/CropToCameraFrameTextRecognizerTest.kt @@ -9,6 +9,7 @@ import net.gini.android.capture.internal.textrecognition.test.TextRecognizerStub import net.gini.android.capture.internal.util.Size import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config /** * Cannot use `@RunWith(JUnitParamsRunner::class)` because android.graphics.Rect needs the implementation provided by Robolectric. @@ -16,6 +17,10 @@ import org.junit.runner.RunWith * > `java.lang.RuntimeException: Method contains in android.graphics.Rect not mocked. See https://developer.android.com/r/studio-ui/build/not-mocked for details.` */ @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) internal class CropToCameraFrameTextRecognizerTest { /** diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/OnboardingPageTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/OnboardingPageTest.kt index dfb88223d3..55efd74728 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/OnboardingPageTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/OnboardingPageTest.kt @@ -11,8 +11,13 @@ import kotlinx.parcelize.Parcelize import net.gini.android.capture.test.Helpers import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class OnboardingPageTest { @Test diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/PageIndicatorsTest.java b/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/PageIndicatorsTest.java index ee3f260978..6261c3cb9e 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/PageIndicatorsTest.java +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/onboarding/PageIndicatorsTest.java @@ -1,20 +1,22 @@ package net.gini.android.capture.onboarding; -import static com.google.common.truth.Truth.assertThat; - -import static net.gini.android.capture.onboarding.PageIndicatorsHelper.isPageActive; -import static net.gini.android.capture.onboarding.PageIndicatorsHelper.isPageInactive; - import android.widget.LinearLayout; -import org.junit.Test; -import org.junit.runner.RunWith; - import androidx.annotation.NonNull; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.annotation.Config; + +import static com.google.common.truth.Truth.assertThat; +import static net.gini.android.capture.onboarding.PageIndicatorsHelper.isPageActive; +import static net.gini.android.capture.onboarding.PageIndicatorsHelper.isPageInactive; + @RunWith(AndroidJUnit4.class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config(maxSdk = 35) public class PageIndicatorsTest { @Test diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/review/multipage/MultipageReviewFragmentTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/review/multipage/MultipageReviewFragmentTest.kt index b9066c93ab..cb08b91708 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/review/multipage/MultipageReviewFragmentTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/review/multipage/MultipageReviewFragmentTest.kt @@ -25,6 +25,7 @@ import org.junit.runner.RunWith import org.mockito.Mockito import org.mockito.Mockito.any import org.mockito.Mockito.`when` +import org.robolectric.annotation.Config /** @@ -34,6 +35,10 @@ import org.mockito.Mockito.`when` */ @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class MultipageReviewFragmentTest { @After diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/tracking/EventTrackingHelperTest.kt b/capture-sdk/sdk/src/test/java/net/gini/android/capture/tracking/EventTrackingHelperTest.kt index 0e3c3c88df..2ff97db7dd 100644 --- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/tracking/EventTrackingHelperTest.kt +++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/tracking/EventTrackingHelperTest.kt @@ -8,6 +8,7 @@ import net.gini.android.capture.tracking.EventTrackingHelper.* import org.junit.After import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config /** * Created by Alpar Szotyori on 02.03.2020. @@ -16,6 +17,10 @@ import org.junit.runner.RunWith */ @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class EventTrackingHelperTest { @After diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9acdc4e8ee..197f9f283a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,16 +1,16 @@ [versions] -android-compileSdk = "35" +android-compileSdk = "36" android-minSdk = "21" -android-targetSdk = "35" -kotlin = "1.9.25" -android-gradle-plugin = "8.6.0" +android-targetSdk = "36" +kotlin = "2.1.0" +android-gradle-plugin = "8.11.1" dokka = "1.9.20" androidx-lifecycle = "2.7.0" androidx-camera = "1.3.1" androidx-fragment = "1.6.2" androidx-test = "1.5.0" androidx-test-junit = "1.1.5" -kotlinx-coroutines = "1.7.1" +kotlinx-coroutines = "1.10.2" koin = "2.2.3" moshi = "1.15.1" mockito = "5.12.0" @@ -18,7 +18,7 @@ espresso = "3.5.1" checkstyle = "7.8.2" pmd = "6.0.0" jacoco = "0.8.10" -hilt = "2.46.1" +hilt = "2.57" navigation_component = "2.7.6" compose-bom = "2024.06.00" accompanist-themeAdapter = "1.1.1" @@ -88,7 +88,8 @@ mlkit-textrecognition = "com.google.android.gms:play-services-mlkit-text-recogni apachecommons-imaging = "org.apache.commons:commons-imaging:1.0-alpha2" completableFuture = "org.glassfish.jersey.bundles.repackaged:jersey-jsr166e:2.25.1" truth = "com.google.truth:truth:1.1.3" -robolectric = "org.robolectric:robolectric:4.14.1" +#TODO: remove these todos: remove after upgrading to robolectric to 4.16 +robolectric = "org.robolectric:robolectric:4.15.1" dexter = "com.karumi:dexter:6.2.3" logback-android-core = "com.github.tony19:logback-android-core:1.1.1-6" logback-android-classic = "com.github.tony19:logback-android-classic:1.1.1-6" @@ -130,4 +131,7 @@ koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose" } orbitmvi-compose = { group = "org.orbit-mvi", name = "orbit-compose", version.ref = "orbitMvi" } orbitmvi-test = { group = "org.orbit-mvi", name = "orbit-test", version.ref = "orbitMvi" } orbitmvi-viewmodel = { group = "org.orbit-mvi", name = "orbit-viewmodel", version.ref = "orbitMvi" } -kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } \ No newline at end of file +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } + +[plugins] +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0bcc7c3480..8a8ac0680e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Sep 29 16:01:46 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/GiniHealthTest.kt b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/GiniHealthTest.kt index 88515e63b3..592c5fd73f 100644 --- a/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/GiniHealthTest.kt +++ b/health-sdk/sdk/src/test/java/net/gini/android/health/sdk/GiniHealthTest.kt @@ -36,6 +36,7 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config import java.util.Date val document = @@ -86,6 +87,10 @@ fun copyExtractions(extractions: ExtractionsContainer) = ExtractionsContainer( @ExperimentalCoroutinesApi @RunWith(AndroidJUnit4::class) +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, +) class GiniHealthTest { @get:Rule diff --git a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/GiniMerchantTest.kt b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/GiniMerchantTest.kt index 7310f0cb7b..4ac698061e 100644 --- a/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/GiniMerchantTest.kt +++ b/merchant-sdk/sdk/src/test/java/net/gini/android/merchant/sdk/GiniMerchantTest.kt @@ -14,9 +14,14 @@ import net.gini.android.internal.payment.GiniInternalPaymentModule import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.robolectric.annotation.Config @RunWith(AndroidJUnit4::class) @ExperimentalCoroutinesApi +//TODO: remove after upgrading to robolectric to 4.16 +@Config( + maxSdk = 35, + ) class GiniMerchantTest { private var context: Context? = null