Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pm 85 pm 84 pm 92 upgrade agp 8 4 2 #486

Merged
merged 9 commits into from
Jul 11, 2024
Merged

Pm 85 pm 84 pm 92 upgrade agp 8 4 2 #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
60bb27f
feat(health-sdk): Upgrade targetSdk
Jul 3, 2024
fc2833d
feat(core-api-library): Upgrade targetSdk
Jul 3, 2024
fea9c07
feat(core-api-library): Upgrade targetSd, fix related test
Jul 3, 2024
59a412a
feat(capture-sdk): Upgrade targetSdk
Jul 3, 2024
52e1146
feat(bank-sdk): Upgrade targetSdk
Jul 3, 2024
a2709a1
feat(bank-api): Upgrade targetSdk
Jul 3, 2024
9aac2c4
feat(gini-mobile-android): Upgrade gradle wrapper, libs targetSdk
Jul 3, 2024
1e3dda7
feat(gini_mobile_android): Upgrade roboelectric
Jul 3, 2024
9daed17
ci(mobile-android): Change readLocalPropertiesToMap to readLocalPrope…
Jul 8, 2024
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
5 changes: 3 additions & 2 deletions bank-api-library/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ android {
}
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt()
testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
lint.targetSdk = libs.versions.android.targetSdk.get().toInt()

// Use the test runner with JUnit4 support
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -113,7 +114,7 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {

doFirst {
propertiesMap.clear()
propertiesMap.putAll(readLocalPropertiesToMap(project,
propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri", "testHealthApiUri")))
}

Expand Down
8 changes: 5 additions & 3 deletions bank-sdk/sdk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ android {
}
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt()
testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
lint.targetSdk = libs.versions.android.targetSdk.get().toInt()

// Use the test runner with JUnit4 support
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -147,8 +148,9 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {

doFirst {
propertiesMap.clear()
propertiesMap.putAll(readLocalPropertiesToMap(project,
listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri")))
propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri"))
)
}

destinations.put(
Expand Down
5 changes: 3 additions & 2 deletions capture-sdk/default-network/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ android {
}
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt()
testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
lint.targetSdk = libs.versions.android.targetSdk.get().toInt()

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
Expand Down Expand Up @@ -119,7 +120,7 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {

doFirst {
propertiesMap.clear()
propertiesMap.putAll(readLocalPropertiesToMap(project,
propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri")))
}

Expand Down
3 changes: 2 additions & 1 deletion capture-sdk/sdk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ android {
}
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt()
testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
lint.targetSdk = libs.versions.android.targetSdk.get().toInt()

// Use the test runner with JUnit4 support
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
3 changes: 2 additions & 1 deletion core-api-library/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ android {
}
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt()
testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
lint.targetSdk = libs.versions.android.targetSdk.get().toInt()

// Use the test runner with JUnit4 support
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
9 changes: 9 additions & 0 deletions core-api-library/library/src/test/java/net/gini/android/core/api/DocumentRemoteSourceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import kotlinx.coroutines.test.TestScope
import kotlinx.coroutines.test.advanceUntilIdle
import kotlinx.coroutines.test.runTest
import net.gini.android.core.api.response.PaymentRequestResponse
import net.gini.android.core.api.response.PaymentResponse
import net.gini.android.core.api.test.DocumentRemoteSourceForTests
import net.gini.android.core.api.test.MockGiniApiType
import okhttp3.RequestBody
Expand Down Expand Up @@ -213,6 +214,14 @@ class DocumentRemoteSourceTest {
return Response.success(listOf(PaymentRequestResponse(null, null, "", "", null, "", "", "")))
}

override suspend fun getPayment(
bearer: Map<String, String>,
id: String
): Response<PaymentResponse> {
bearerAuthHeader = bearer["Authorization"]
return Response.success(PaymentResponse("", "", "", null, "", "" ))
}

override suspend fun getFile(bearer: Map<String, String>, location: String): Response<ResponseBody> {
bearerAuthHeader = bearer["Authorization"]
return Response.success("response".toResponseBody())
Expand Down
3 changes: 2 additions & 1 deletion core-api-library/shared-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ android {
}
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt()
testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
lint.targetSdk = libs.versions.android.targetSdk.get().toInt()

// Use the test runner with JUnit4 support
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[versions]
android-compileSdk = "34"
android-minSdk = "21"
android-targetSdk = "33"
android-targetSdk = "34"
kotlin = "1.8.20"
android-gradle-plugin = "8.2.1"
android-gradle-plugin = "8.4.2"
dokka = "1.7.20"
androidx-lifecycle = "2.7.0"
androidx-camera = "1.3.1"
Expand Down Expand Up @@ -83,7 +83,7 @@ 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.9"
robolectric = "org.robolectric:robolectric:4.12.2"
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"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Sep 29 16:01:46 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
5 changes: 3 additions & 2 deletions health-api-library/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ android {
}
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt()
testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
lint.targetSdk = libs.versions.android.targetSdk.get().toInt()

// Use the test runner with JUnit4 support
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -124,7 +125,7 @@ tasks.register<CreatePropertiesTask>("injectTestProperties") {

doFirst {
propertiesMap.clear()
propertiesMap.putAll(readLocalPropertiesToMap(project,
propertiesMap.putAll(readLocalPropertiesToMapSilent(project,
listOf("testClientId", "testClientSecret", "testApiUri", "testUserCenterUri", "testBankApiUri")))
}

Expand Down
3 changes: 2 additions & 1 deletion health-sdk/sdk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ android {
}
defaultConfig {
minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt()
testOptions.targetSdk = libs.versions.android.targetSdk.get().toInt()
lint.targetSdk = libs.versions.android.targetSdk.get().toInt()

// Use the test runner with JUnit4 support
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down
Loading