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

feat: bump stripe_terminal sdk to 3.4.0 #58

Merged
merged 1 commit into from
Mar 10, 2024
Merged
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
18 changes: 9 additions & 9 deletions .github/workflows/stripe_terminal_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ jobs:
- name: Analyze code
run: flutter analyze --no-fatal-infos

# Android
- uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'zulu'
- run: ./gradlew spotlessCheck
working-directory: stripe_terminal/android
- run: ./gradlew :mek_stripe_terminal:assemble --project-dir ../example/android
working-directory: stripe_terminal/android
# # Android
# - uses: actions/setup-java@v3
# with:
# java-version: '17'
# distribution: 'zulu'
# - run: ./gradlew spotlessCheck
# working-directory: stripe_terminal/android
# - run: ./gradlew :mek_stripe_terminal:assemble --project-dir ../example/android
# working-directory: stripe_terminal/android

integration-example:
runs-on: macos-latest
Expand Down
18 changes: 9 additions & 9 deletions stripe_terminal/.metadata
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled.
# This file should be version controlled and should not be manually edited.

version:
revision: 796c8ef79279f9c774545b3771238c3098dbefab
channel: stable
revision: "41456452f29d64e8deb623a3c927524bcf9f111b"
channel: "stable"

project_type: plugin

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
- platform: android
create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
- platform: ios
create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
create_revision: 41456452f29d64e8deb623a3c927524bcf9f111b
base_revision: 41456452f29d64e8deb623a3c927524bcf9f111b

# User provided section

Expand Down
7 changes: 4 additions & 3 deletions stripe_terminal/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## 3.3.0
- chore: Bumped [Android](https://github.com/stripe/stripe-terminal-android/blob/master/CHANGELOG.md#330---2024-01-30)
and [IOS](https://github.com/stripe/stripe-terminal-ios/blob/master/CHANGELOG.md#330-2024-02-02) sdks versions to `3.3.0`
## 3.4.0
- chore: Bumped [Android](https://github.com/stripe/stripe-terminal-android/blob/master/CHANGELOG.md#340---2024-03-04)
and [IOS](https://github.com/stripe/stripe-terminal-ios/blob/master/CHANGELOG.md#340-2024-03-04) sdks versions to `3.4.0`
- refactor: Renamed `TerminalExceptionCode.bluetoothConnectionFailedBatteryCriticallyLow` to `TerminalExceptionCode.readerBatteryCriticallyLow`

## 3.2.1
- chore: Bumped [Android](https://github.com/stripe/stripe-terminal-android/blob/master/CHANGELOG.md#321---2023-12-18)
Expand Down
18 changes: 9 additions & 9 deletions stripe_terminal/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
buildscript {
ext.kotlin_version = '1.7.10'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.android.tools.build:gradle:7.3.0'
}
}

Expand All @@ -29,8 +27,11 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
namespace "mek.stripeterminal"
compileSdk 34
if (project.android.hasProperty("namespace")) {
namespace "mek.stripeterminal"
}

compileSdkVersion 34

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -52,7 +53,7 @@ android {

dependencies {
testImplementation 'org.jetbrains.kotlin:kotlin-test'
testImplementation 'org.mockito:mockito-core:5.1.1'
testImplementation 'org.mockito:mockito-core:5.0.0'
}

testOptions {
Expand All @@ -69,9 +70,8 @@ android {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
api "com.stripe:stripeterminal-localmobile:3.2.1"
api "com.stripe:stripeterminal-core:3.2.1"
implementation "com.stripe:stripeterminal-localmobile:3.4.0"
implementation "com.stripe:stripeterminal-core:3.4.0"
}

spotless {
Expand Down
16 changes: 0 additions & 16 deletions stripe_terminal/android/gradle.properties

This file was deleted.

Binary file not shown.

This file was deleted.

234 changes: 0 additions & 234 deletions stripe_terminal/android/gradlew

This file was deleted.

Loading
Loading