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

Updated targetSDK to 34 #114

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4ed872b
changed targetSDK to 34 also required dependency to run the project o…
Nilay-squareup Aug 14, 2024
bdc1246
update jdk to 17 for pipelines
Nilay-squareup Aug 14, 2024
7490ec4
fixing proguard issue in pipelines
Nilay-squareup Aug 26, 2024
314cad9
fixing notification permissions issue in pipelines
Nilay-squareup Aug 26, 2024
c8ddf57
fixing lint error for camera permission in pipelines
Nilay-squareup Aug 26, 2024
5cfd44f
fixing pipeling for minifyEnable
Nilay-squareup Aug 26, 2024
812a0b3
fixing ios pipelines
Nilay-squareup Aug 26, 2024
a018f91
fixing pipelines for ios
Nilay-squareup Aug 26, 2024
822ce07
updated run script
Nilay-squareup Aug 27, 2024
75fe91e
updated run script
Nilay-squareup Aug 27, 2024
165ad9a
updated run phase
Nilay-squareup Aug 27, 2024
1f39e5e
updated run phase
Nilay-squareup Aug 14, 2024
85266d6
updated main.yml file
Nilay-squareup Sep 5, 2024
b7109a1
updated main.yml file
Nilay-squareup Sep 5, 2024
0699476
updated main.yml file new
Nilay-squareup Sep 5, 2024
0066174
yml file change and project.pbx file add
Nilay-squareup Sep 5, 2024
3c0ec48
Update xcodebuild command to not using code signing
brandonjenniges Sep 9, 2024
f7137f0
Flutter ReaderSDK version update 4.0.2
Nilay-squareup Sep 10, 2024
bffe01a
Try to clean derived data after to clean up space
brandonjenniges Sep 9, 2024
b537b20
Extract out ios r1 version and use an env variable
brandonjenniges Sep 10, 2024
3582c42
Merge pull request #119 from square/brandonjenniges/ci_fix
brandonjenniges Sep 10, 2024
e1bcc4a
reader sdk ios version bump to 1.7.4 and android 1.7.7
Nilay-squareup Sep 16, 2024
1442195
Merge branch 'master' into bump_targetSdk_to_34
Nilay-squareup Sep 16, 2024
1bf1fae
Resolve PR comments
Nilay-squareup Sep 19, 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
49 changes: 37 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,58 @@
name: reader-sdk-flutter-plugin

on: [push]

env:
IOS_READER_SDK_VERSION: 1.7.4

jobs:
install-and-test:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v3

- name: Cleanup
run: |
sudo rm -rf ~/Library/Developer/Xcode/DerivedData/*
sudo rm -rf ~/Library/Developer/Xcode/Archives/*
sudo rm -rf ~/Library/Caches/*
sudo rm -rf /Library/Developer/CoreSimulator/Profiles/Runtimes/*
sudo rm -rf /Users/runner/Library/Developer/CoreSimulator/Caches/*
sudo rm -rf /Users/runner/Library/Developer/CoreSimulator/Devices/*
sudo rm -rf /Users/runner/.gradle/caches

- name: Checkout repository
uses: actions/checkout@v2

- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
- uses: subosito/flutter-action@v1

- name: Set up Flutter
uses: subosito/flutter-action@v1
with:
channel: 'stable' # or: 'beta', 'dev' or 'master'
- run: flutter pub get
# Android
- run: |
channel: 'stable'

- name: Install dependencies
run: flutter pub get

- name: Android
run: |
cd example
flutter pub get
cd android
./gradlew clean build -PSQUARE_READER_SDK_APPLICATION_ID=${{secrets.SQUARE_READER_SDK_APPLICATION_ID}} -PSQUARE_READER_SDK_REPOSITORY_PASSWORD=${{secrets.SQUARE_READER_SDK_REPOSITORY_PASSWORD}}
# #IOS
- run: |

- name: iOS
run: |
cd example
flutter pub get
cd ios
ruby <(curl https://connect.squareup.com/readersdk-installer) install --app-id ${{secrets.SQUARE_READER_SDK_APPLICATION_ID}} --repo-password ${{secrets.SQUARE_READER_SDK_REPOSITORY_PASSWORD}} --version 1.6.1 > /dev/null
ruby <(curl https://connect.squareup.com/readersdk-installer) install --app-id ${{secrets.SQUARE_READER_SDK_APPLICATION_ID}} --repo-password ${{secrets.SQUARE_READER_SDK_REPOSITORY_PASSWORD}} --version $IOS_READER_SDK_VERSION > /dev/null
flutter clean
rm Pods && rm Podfile.lock

flutter pub get
pod update Firebase/CoreOnly
pod install --repo-update
xcodebuild -workspace Runner.xcworkspace -configuration Debug -scheme Runner -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14"
xcodebuild -workspace Runner.xcworkspace -configuration Debug -scheme Runner -sdk iphoneos SKIP_SETUP_SCRIPT=YES CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Changelog

### v4.0.2 Sep 18, 2024

* Upgrade to Reader SDK 1.7.7 on Android.
brandonjenniges marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this version also update to 1.7.4 on iOS?


### v4.0.1 Aug 29st, 2024

* Upgrade to Reader SDK 1.7.5 on Android.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ you invoke any of Reader plugin method.
The Flutter plugin for Reader SDK acts as a wrapper on the native SDKs and is
currently compatible with the following native Reader SDK versions:

* iOS: 1.6.0 and above
* Android: 1.7.5 and above
* iOS: 1.7.4 and above
* Android: 1.7.7 and above

Try the [sample app] to see the plugin in action or follow the instructions in
the [getting started guide] to build a custom solution from scratch.
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ rootProject.allprojects {
apply plugin: 'com.android.library'

def DEFAULT_PLAY_SERVICES_BASE_VERSION = '16.0.1'
def READER_SDK_VERSION = '1.7.5'
def READER_SDK_VERSION = '1.7.7'

android {
compileSdkVersion 34
Expand Down
2 changes: 1 addition & 1 deletion doc/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies:

...

square_reader_sdk: ^4.0.0
square_reader_sdk: ^4.0.2
```

## Step 3: Request Reader SDK credentials
Expand Down
4 changes: 2 additions & 2 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ allprojects {

ext {
// Override the reader sdk version with this parameter
// Make sure the version is above min version 1.7.5
readerSdkVersion = "1.7.5"
// Make sure the version is above min version 1.7.7
readerSdkVersion = "1.7.7"
}

rootProject.buildDir = '../build'
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>9.0</string>
<string>12.0</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
platform :ios, '11.1'
platform :ios, '13.1'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down Expand Up @@ -66,4 +66,4 @@ post_install do |installer|
config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
end
end
end
end
24 changes: 19 additions & 5 deletions example/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -219,10 +219,11 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "FRAMEWORKS=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\n\"${FRAMEWORKS}/SquareReaderSDK.framework/setup\"\n\n";
shellScript = "# Skip the script in CI builds\nif [ \"$SKIP_SETUP_SCRIPT\" = \"YES\" ]; then\n exit 0\nfi\n\nFRAMEWORKS=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\n\"${FRAMEWORKS}/SquareReaderSDK.framework/setup\"\n";
};
324E410A8DA310037B0B821B /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand All @@ -240,20 +241,23 @@
};
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
);
name = "Thin Binary";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
};
90342CCEE2EE75FC4F40EB89 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand All @@ -276,6 +280,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand Down Expand Up @@ -382,6 +387,7 @@
DEVELOPMENT_TEAM = C2UGS295KL;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -507,16 +513,20 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = C2UGS295KL;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutter.squareup.sdk.example;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -530,16 +540,20 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = C2UGS295KL;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.example.flutter.squareup.sdk.example;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 2 additions & 0 deletions example/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,7 @@
<false/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: square_reader_sdk
description: An open source Flutter plugin for calling Square’s native Reader SDK implementations to take in-person payments on iOS and Android.
version: 4.0.1
version: 4.0.2
homepage: https://github.com/square/reader-sdk-flutter-plugin

environment:
Expand Down
Loading