diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2905ced1..be40a9c3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: test_sdk: name: Test LINE SDK - runs-on: macOS-13 + runs-on: macos-13 strategy: matrix: swift-version: ["5.0", "4.2"] @@ -27,7 +27,7 @@ jobs: run: bundle exec fastlane sdk_tests lint_pod: name: Lint CocoaPods - runs-on: macOS-13 + runs-on: macos-13 strategy: matrix: swift-version: ["5.0", "4.2"] @@ -49,7 +49,7 @@ jobs: run: bundle exec fastlane lint_pod lint_spm: name: Lint Swift Package Manager - runs-on: macOS-12 + runs-on: macos-13 steps: - uses: actions/checkout@v2 - uses: actions/cache@v1 @@ -66,7 +66,7 @@ jobs: run: bundle exec fastlane lint_spm xcframework: name: Build XCFramework - runs-on: macOS-12 + runs-on: macos-13 steps: - uses: actions/checkout@v2 - uses: actions/cache@v1 diff --git a/.ruby-version b/.ruby-version index a4dd9dba..0aec50e6 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.4 +3.1.4 diff --git a/Gemfile.lock b/Gemfile.lock index c523e53e..fa028b9e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,12 +3,17 @@ GEM specs: CFPropertyList (3.0.6) rexml - activesupport (7.0.5) + activesupport (7.1.1) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) @@ -16,29 +21,31 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.776.0) - aws-sdk-core (3.174.0) + aws-partitions (1.843.0) + aws-sdk-core (3.185.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.66.0) - aws-sdk-core (~> 3, >= 3.174.0) + aws-sdk-kms (1.72.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.123.1) - aws-sdk-core (~> 3, >= 3.174.0) + aws-sdk-s3 (1.136.0) + aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.6) + aws-sigv4 (1.6.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) + base64 (0.1.1) + bigdecimal (3.1.4) claide (1.1.0) - cocoapods (1.12.1) + cocoapods (1.14.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.1) + cocoapods-core (= 1.14.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.6.0, < 2.0) + cocoapods-downloader (>= 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-trunk (>= 1.6.0, < 2.0) @@ -50,8 +57,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.1) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.14.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -62,7 +69,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.6.3) + cocoapods-downloader (2.0) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -75,17 +82,20 @@ GEM commander (4.6.0) highline (~> 2.0.0) concurrent-ruby (1.2.2) + connection_pool (2.4.1) declarative (0.0.20) - digest-crc (0.6.4) + digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.8.1) + drb (2.1.1) + ruby2_keywords emoji_regex (3.2.3) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - excon (0.100.0) + excon (0.104.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -115,7 +125,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.7) - fastlane (2.213.0) + fastlane (2.216.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -136,6 +146,7 @@ GEM google-apis-playcustomapp_v1 (~> 0.1) google-cloud-storage (~> 1.31) highline (~> 2.0) + http-cookie (~> 1.0.5) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) @@ -147,7 +158,7 @@ GEM security (= 0.1.3) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) + terminal-table (~> 3) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) @@ -156,13 +167,13 @@ GEM xcpretty-travis-formatter (>= 0.0.3) fastlane-plugin-changelog (0.16.0) fastlane-plugin-create_xcframework (1.1.2) - ffi (1.15.5) + ffi (1.16.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.42.0) + google-apis-androidpublisher_v3 (0.51.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-core (0.11.0) + google-apis-core (0.11.2) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -191,10 +202,9 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.5.2) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) @@ -204,29 +214,28 @@ GEM httpclient (2.8.3) i18n (1.14.1) concurrent-ruby (~> 1.0) - jazzy (0.14.3) + jazzy (0.14.4) cocoapods (~> 1.5) mustache (~> 1.1) open4 (~> 1.3) redcarpet (~> 3.4) rexml (~> 3.2) - rouge (>= 2.0.6, < 4.0) + rouge (>= 2.0.6, < 5.0) sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) jmespath (1.6.2) json (2.6.3) - jwt (2.7.0) + jwt (2.7.1) liferaft (0.0.6) - memoist (0.16.2) mini_magick (4.12.0) - mini_mime (1.1.2) - mini_portile2 (2.8.2) - minitest (5.18.0) + mini_mime (1.1.5) + minitest (5.20.0) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.3.0) mustache (1.1.1) + mutex_m (0.1.2) nanaimo (0.3.0) nap (1.1.0) naturally (2.2.1) @@ -236,14 +245,14 @@ GEM os (1.1.4) plist (3.7.0) public_suffix (4.0.7) - rake (13.0.6) + rake (13.1.0) redcarpet (3.6.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.5) + rexml (3.2.6) rouge (2.0.7) ruby-macho (2.5.1) ruby2_keywords (0.0.5) @@ -251,7 +260,7 @@ GEM sassc (2.4.0) ffi (~> 1.9) security (0.1.3) - signet (0.17.0) + signet (0.18.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -259,11 +268,10 @@ GEM simctl (1.6.10) CFPropertyList naturally - sqlite3 (1.6.3) - mini_portile2 (~> 2.8.0) + sqlite3 (1.6.7-arm64-darwin) terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) trailblazer-option (0.1.2) tty-cursor (0.7.1) tty-screen (0.8.1) @@ -277,7 +285,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (1.8.0) + unicode-display_width (2.5.0) webrick (1.8.1) word_wrap (1.0.0) xcinvoke (0.3.0) @@ -285,7 +293,7 @@ GEM xcode-install (2.8.1) claide (>= 0.9.1) fastlane (>= 2.1.0, < 3.0.0) - xcodeproj (1.22.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -298,7 +306,7 @@ GEM xcpretty (~> 0.2, >= 0.0.7) PLATFORMS - ruby + arm64-darwin-22 DEPENDENCIES cocoapods @@ -309,4 +317,4 @@ DEPENDENCIES xcode-install BUNDLED WITH - 2.1.4 + 2.3.26 diff --git a/LineSDK/LineSDKObjCInterfaceTests/LineSDKMessagingModelTests.m b/LineSDK/LineSDKObjCInterfaceTests/LineSDKMessagingModelTests.m index 49c4d189..90e2bcec 100644 --- a/LineSDK/LineSDKObjCInterfaceTests/LineSDKMessagingModelTests.m +++ b/LineSDK/LineSDKObjCInterfaceTests/LineSDKMessagingModelTests.m @@ -132,8 +132,8 @@ - (void)testMessageActionInterface { initWithLabel:@"action" uri:[NSURL URLWithString:@"https://example.com"]]; XCTAssertEqual(action.label, @"action"); - XCTAssertEqual(action.uri.absoluteString, @"https://example.com"); - + XCTAssertEqualObjects(action.uri.absoluteString, @"https://example.com"); + XCTAssertNotEqual([action URIAction], action); XCTAssertEqual([action URIAction].label, action.label); @@ -252,7 +252,7 @@ - (void)testTemplateImageCarouselPayloadColumnInterface { LineSDKTemplateImageCarouselPayloadColumn *column = [[LineSDKTemplateImageCarouselPayloadColumn alloc] initWithImageURL:[NSURL URLWithString:@"https://image.com"] action:action]; - XCTAssertEqual([column imageURL].absoluteString, @"https://image.com"); + XCTAssertEqualObjects([column imageURL].absoluteString, @"https://image.com"); XCTAssertNotNil(column.action); } @@ -429,8 +429,8 @@ - (void)testFlexImageComponentInterface { component.aspectRatio = LineSDKFlexMessageComponentAspectRatioRatio_1x3; component.aspectMode = LineSDKFlexMessageComponentAspectModeFill; component.backgroundColor = nil; - XCTAssertEqual(component.url.absoluteString, @"https://example.com"); - XCTAssertEqual([component imageComponent].url.absoluteString, @"https://example.com"); + XCTAssertEqualObjects(component.url.absoluteString, @"https://example.com"); + XCTAssertEqualObjects([component imageComponent].url.absoluteString, @"https://example.com"); } - (void)testFlexFillerComponentInterface { diff --git a/fastlane/Fastfile b/fastlane/Fastfile index e8cb3cfc..15e5617c 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -4,7 +4,7 @@ platform :ios do before_all do begin - xcversion(version: "~> 14.0") + xcversion(version: "~> 15.0") rescue => ex UI.error("Failed when switching to Xcode version: #{ex}") end @@ -24,14 +24,14 @@ platform :ios do swift_version = ENV["SWIFT_VERSION"] || "4.2" run_tests( workspace: "LineSDK.xcworkspace", - devices: ["iPhone 11"], + devices: ["iPhone 14"], scheme: "LineSDK", xcargs: "SWIFT_VERSION=#{swift_version}" ) run_tests( workspace: "LineSDK.xcworkspace", - devices: ["iPhone 11"], + devices: ["iPhone 14"], scheme: "LineSDKObjC", xcargs: "SWIFT_VERSION=#{swift_version}" ) @@ -40,14 +40,14 @@ platform :ios do lane :sample_tests do run_tests( workspace: "LineSDK.xcworkspace", - devices: ["iPhone 11"], + devices: ["iPhone 14"], scheme: "LineSDKSample" ) end - desc "Lint to check Carthage and CocoaPods compatibility." + desc "Lint to check dependency manager compatibility." lane :lint do - # lint_carthage + lint_spm lint_pod end @@ -56,12 +56,11 @@ platform :ios do Action.sh("bundle exec pod lib lint ../LineSDKSwift.podspec --swift-version=#{swift_version}") end - lane :lint_carthage do - carthage(command: "build", no_skip_current: true) - end - lane :lint_spm do - sh('swift build -v -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios13.0-simulator"') + # swift build seems not properly working under Xcode 15.0 since the `-isysroot` is always set to macOS SDK. + # Use Xcode 14 to lint spm for a while. + xcversion(version: "~> 14.0") + sh('swift build -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "arm64-apple-ios16.4-simulator"') end desc "Release a new version." diff --git a/fastlane/README.md b/fastlane/README.md index c6941989..dd4f0ed3 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -53,7 +53,7 @@ Run tests. [bundle exec] fastlane ios lint ``` -Lint to check Carthage and CocoaPods compatibility. +Lint to check dependency manager compatibility. ### ios lint_pod @@ -63,14 +63,6 @@ Lint to check Carthage and CocoaPods compatibility. -### ios lint_carthage - -```sh -[bundle exec] fastlane ios lint_carthage -``` - - - ### ios lint_spm ```sh