Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions bank-sdk/example-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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") {
Expand All @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions bank-sdk/sdk/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ plugins {
id("kotlin-parcelize")
id("jacoco")
id("androidx.navigation.safeargs.kotlin")
alias(libs.plugins.compose.compiler)

}

jacoco {
Expand Down
4 changes: 4 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions capture-sdk/sdk/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ plugins {
id("kotlin-parcelize")
id("jacoco")
id("androidx.navigation.safeargs")
alias(libs.plugins.compose.compiler)
}

jacoco {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -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.
*
* <p>
* 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
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -29,18 +20,26 @@
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.
*
* 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
Expand Down
Loading
Loading