From 871dabd5bea31a2a64fde3ad893914a464d96d17 Mon Sep 17 00:00:00 2001 From: Yu Takahashi <65745715+taka-2120@users.noreply.github.com> Date: Sat, 28 Dec 2024 15:21:08 +0900 Subject: [PATCH 1/6] chore: add swift.yml for automatic building --- .github/workflows/swift.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/swift.yml diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml new file mode 100644 index 0000000..401abb6 --- /dev/null +++ b/.github/workflows/swift.yml @@ -0,0 +1,22 @@ +# This workflow will build a Swift project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift + +name: Swift + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: macos-latest + + steps: + - uses: actions/checkout@v4 + - name: Build + run: swift build -v + # - name: Run tests + # run: swift test -v From 7e17ce4a31244bcf0055882734deb7b937632b62 Mon Sep 17 00:00:00 2001 From: taka-2120 Date: Sat, 28 Dec 2024 15:37:25 +0900 Subject: [PATCH 2/6] chore: runs on ubuntu and uses Swift 6.0 --- .github/workflows/swift.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 401abb6..7da401a 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -1,6 +1,3 @@ -# This workflow will build a Swift project -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift - name: Swift on: @@ -12,11 +9,19 @@ on: jobs: build: - runs-on: macos-latest + runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 + + - name: Install Swift + uses: slashmo/install-swift@v0.1.0 + with: + version: 6.0 + - name: Build run: swift build -v + # - name: Run tests # run: swift test -v From 1552aca2307a779c1ba04346551a4c77389abc86 Mon Sep 17 00:00:00 2001 From: taka-2120 Date: Sat, 28 Dec 2024 15:41:32 +0900 Subject: [PATCH 3/6] chore: update ubuntu version and install-swift version --- .github/workflows/swift.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 7da401a..18c8a02 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -9,14 +9,14 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Install Swift - uses: slashmo/install-swift@v0.1.0 + uses: slashmo/install-swift@v0.4.0 with: version: 6.0 From 6e340c69559bbe3f8481dc2155c70554e863501b Mon Sep 17 00:00:00 2001 From: taka-2120 Date: Sat, 28 Dec 2024 16:33:30 +0900 Subject: [PATCH 4/6] chore: modify configurations for Package.swift --- Package.resolved | 2 +- Package.swift | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Package.resolved b/Package.resolved index e6fe432..0c5cbde 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "12a5e04b0dbe1a14b872e81cbbcc874649ef776786cd77702356c3e82ae7521c", + "originHash" : "db360b4c50aaa2dfff37dc2ab0981a59b08b141c5120e57e1d455f7e6c5db82c", "pins" : [ { "identity" : "swift-package-manager-google-mobile-ads", diff --git a/Package.swift b/Package.swift index 12a0c24..03fe462 100644 --- a/Package.swift +++ b/Package.swift @@ -22,6 +22,12 @@ let package = Package( name: "AdMobComponents", dependencies: [ .product(name: "GoogleMobileAds", package: "swift-package-manager-google-mobile-ads"), + ], + resources: [ + .copy("Native/NativeAdView.xib"), + ], + linkerSettings: [ + .unsafeFlags(["-ObjC"]), ] ), .testTarget( From 4f9cfc9545302931f966505907b54f21f5ff9d17 Mon Sep 17 00:00:00 2001 From: taka-2120 Date: Thu, 9 Jan 2025 13:04:35 +0900 Subject: [PATCH 5/6] chore: enable building and linting actions --- .github/workflows/lint.yml | 13 +++++++++++++ .github/workflows/swift.yml | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/lint.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..9355b5d --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,13 @@ +name: Lint + +on: pull_request + +jobs: + Lint: + runs-on: macos-latest + + steps: + - uses: actions/checkout@v4 + + - name: SwiftFormat + run: swiftformat --lint . --reporter github-actions-log \ No newline at end of file diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 18c8a02..b29582e 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -8,20 +8,20 @@ on: jobs: build: - - runs-on: ubuntu-22.04 + runs-on: macos-15 steps: + - uses: actions/checkout@v4 - - uses: actions/checkout@v4 + - uses: k-arindam/setup-swift@v6.0.0 + with: + swift-version: "6.0" - - name: Install Swift - uses: slashmo/install-swift@v0.4.0 - with: - version: 6.0 + - name: Get swift version + run: swift --version - - name: Build - run: swift build -v + - name: Build + run: swift build -v - # - name: Run tests - # run: swift test -v + # - name: Run tests + # run: swift test -v \ No newline at end of file From 040e59908338edff1e083fa20cd9846f9232c806 Mon Sep 17 00:00:00 2001 From: taka-2120 Date: Thu, 9 Jan 2025 13:15:12 +0900 Subject: [PATCH 6/6] chore: enable resetting packages before build action --- .github/workflows/swift.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index b29582e..9d7767d 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -20,6 +20,12 @@ jobs: - name: Get swift version run: swift --version + - name: Reset package caches + run: swift package reset + + - name: Resolve packages + run: swift package resolve + - name: Build run: swift build -v