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.

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

Update native sdks to 2.0.0 #101

Merged
merged 20 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from 19 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
2 changes: 1 addition & 1 deletion .github/scripts/uitests_for_android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ if [ -f machine.log ]; then
fi

# Run tests and print logs
flutter test --machine -d emulator-5554 -r expanded integration_test >machine.log || exit 1
flutter test --machine -d emulator-5554 -r expanded integration_test >machine.log

# Shutdown emulator
adb -s emulator-5554 emu kill
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/uitests_for_ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cd ./example || exit 1
flutter clean || exit 1

# Run tests and print logs
flutter test --machine -d "${DEVICE}" -r expanded integration_test >machine.log || exit 1
flutter test --machine -d "${DEVICE}" -r expanded integration_test >machine.log

# Shutdown simulator
xcrun simctl shutdown "${DEVICE}"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ jobs:
run: sh .github/scripts/uitests_for_ios.sh

- name: Archive test results
if: ${{ failure() }}
uses: actions/upload-artifact@v4
with:
name: logs_ios
Expand Down Expand Up @@ -94,6 +95,7 @@ jobs:
run: sh .github/scripts/uitests_for_android.sh

- name: Archive test results
if: ${{ failure() }}
uses: actions/upload-artifact@v4
with:
name: logs_android
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ apply plugin: "kotlin-android"

android {
compileSdkVersion(33)
buildToolsVersion = "33.0.2"
buildToolsVersion("33.0.2")

sourceSets {
main.java.srcDirs += "src/main/kotlin"
}

defaultConfig {
minSdkVersion = 19
minSdkVersion(19)
targetSdkVersion(33)
multiDexEnabled = true

Expand All @@ -55,6 +55,6 @@ android {

dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
implementation("io.didomi.sdk:android:1.90.0")
implementation("io.didomi.sdk:android:2.0.0")
implementation("androidx.multidex:multidex:2.0.1")
}
Loading