Based on add-ci-workflow

Optable · Nov 13, 2024 · a988b63 · a988b63
1 parent 5e970c6
commit a988b63
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 152 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/ios-sdk-ci.yml b/.github/workflows/ios-sdk-ci.yml
@@ -0,0 +1,76 @@
+name: "iOS SDK CI"
+
+on: 
+    pull_request:
+    # push: # TODO: To be validated
+    #     branches-ignore: '*'
+    #     tags:
+    #         - '^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$'
+
+jobs:
+  setup:
+    name: "Setup"
+    runs-on: macos-14
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: Install ruby and gem dependencies
+        uses: ruby/setup-ruby@v1
+        with:
+            ruby-version: 3.0.7
+            bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+  sdk-tests:
+    name: "SDK Tests"
+    runs-on: macos-14
+    needs: [setup]
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: Bundle install
+        run: bundle install
+      - name: Run Tests
+        run: bundle exec fastlane tests
+      - name: Store Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: ./fastlane/test_output
+
+  build-demo-swift:
+    name: "Build Demo Swift"
+    runs-on: macos-14
+
+    needs: [setup, sdk-tests]
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: Bundle install
+        run: bundle install
+      - name: Build Demo Swift
+        id: build-demo-swift
+        run: bundle exec fastlane demo_swift
+    #   - name: Store Artifacts
+    #     uses: actions/upload-artifact@v4
+    #     with:
+    #       name: demo-swift
+    #       path:
+
+  build-demo-objc:
+    name: "Build Demo Objective-C"
+    runs-on: macos-14
+    env:
+      FL_OUTPUT_DIR: output
+    needs: [setup, sdk-tests]
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+      - name: Bundle install
+        run: bundle install
+      - name: Build Demo Objective-C
+        run: bundle exec fastlane demo_objc
+    #   - name: Store Artifacts
+    #     uses: actions/upload-artifact@v4
+    #     with:
+    #       name: demo-objc
+    #       path:
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 gem 'fastlane'
-gem 'cocoapods'
+gem "cocoapods", "= 1.12.0"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (6.1.4.4)
+    activesupport (6.1.7.9)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -34,26 +34,26 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.0.3)
-    cocoapods (1.11.2)
+    cocoapods (1.12.0)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.2)
+      cocoapods-core (= 1.12.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 1.6.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.8.0)
       nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
+      ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.2)
-      activesupport (>= 5.0, < 7)
+    cocoapods-core (1.12.0)
+      activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -63,7 +63,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.5.1)
+    cocoapods-downloader (1.6.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -75,7 +75,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.3.4)
     declarative (0.0.20)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
@@ -84,7 +84,7 @@ GEM
     dotenv (2.7.6)
     emoji_regex (3.2.3)
     escape (0.0.4)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     excon (0.89.0)
     faraday (1.8.0)
@@ -151,7 +151,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    ffi (1.15.4)
+    ffi (1.17.0)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -197,15 +197,15 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.6.1)
     jwt (2.3.0)
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    minitest (5.15.0)
+    minitest (5.25.1)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
@@ -245,9 +245,9 @@ GEM
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unf (0.1.4)
@@ -267,13 +267,13 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.5.3)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (= 1.12.0)
   fastlane
 
 BUNDLED WITH

diff --git a/OptableSDK.xcodeproj/xcshareddata/xcschemes/OptableSDK.xcscheme b/OptableSDK.xcodeproj/xcshareddata/xcschemes/OptableSDK.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/demo-ios-objc/Podfile.lock b/demo-ios-objc/Podfile.lock
@@ -76,4 +76,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 48d927338b39550c29272b694f6c18710f33f913
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.12.0
diff --git a/demo-ios-objc/demo-ios-objc/GAMBannerViewController.m b/demo-ios-objc/demo-ios-objc/GAMBannerViewController.m
@@ -21,7 +21,7 @@ @implementation GAMBannerViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    self.bannerView = [[GADBannerView alloc] initWithAdSize:kGADAdSizeBanner];
+    self.bannerView = [[GADBannerView alloc] initWithAdSize:GADAdSizeBanner];
     self.bannerView.adUnitID = @"/22081946781/ios-sdk-demo/mobile-leaderboard";
     [self addBannerViewToView:self.bannerView];
     self.bannerView.rootViewController = self;
@@ -76,7 +76,7 @@ - (void)addBannerViewToView:(UIView *)bannerView {
       [NSLayoutConstraint constraintWithItem:bannerView
                                  attribute:NSLayoutAttributeBottom
                                  relatedBy:NSLayoutRelationEqual
-                                    toItem:self.bottomLayoutGuide
+                                    toItem:self.view.safeAreaLayoutGuide.bottomAnchor
                                  attribute:NSLayoutAttributeTop
                                 multiplier:1
                                   constant:0],

diff --git a/demo-ios-swift/Podfile.lock b/demo-ios-swift/Podfile.lock
@@ -76,4 +76,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: a7bf67fad0ec61ca3a95f0f8a9aadf2c4fd2cd76
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.12.0
diff --git a/demo-ios-swift/demo-ios-swift/GAMBannerViewController.swift b/demo-ios-swift/demo-ios-swift/GAMBannerViewController.swift
@@ -22,7 +22,7 @@ class GAMBannerViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        bannerView = GADBannerView(adSize: kGADAdSizeBanner)
+        bannerView = GADBannerView(adSize: GADAdSizeBanner)
         addBannerViewToView(bannerView)
         bannerView.rootViewController = self
     }
@@ -144,7 +144,7 @@ class GAMBannerViewController: UIViewController {
             NSLayoutConstraint(item: bannerView,
                             attribute: .bottom,
                             relatedBy: .equal,
-                            toItem: bottomLayoutGuide,
+                            toItem: view.safeAreaLayoutGuide.bottomAnchor,
                             attribute: .top,
                             multiplier: 1,
                             constant: 0),

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -1,8 +1,9 @@
+opt_out_usage
 default_platform :ios
 
 platform :ios do
   before_all do
-    setup_circle_ci
+    setup_ci if ENV['CI'] # it creates a temporary keychain. Without this, the build could freeze and never finish
   end
 
   desc "Runs all the OptableSDK tests"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -76,4 +76,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 48d927338b39550c29272b694f6c18710f33f913

		COCOAPODS: 1.11.2
		COCOAPODS: 1.12.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -76,4 +76,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: a7bf67fad0ec61ca3a95f0f8a9aadf2c4fd2cd76

		COCOAPODS: 1.11.2
		COCOAPODS: 1.12.0