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

Version 0.6.0 #36

Merged
merged 5 commits into from
Oct 4, 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
11 changes: 11 additions & 0 deletions .github/actions/pod-lib-lint/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: 'Run Pod Lib Lint'
description: 'This action contains steps for running pod lib lint against a podspec.'
runs:
using: "composite"
steps:
- name: Pod Repo Update
shell: bash
run: pod repo update
- name: Lint Podspec
shell: bash
run: pod lib lint --private --verbose --sources=https://github.com/CruGlobal/cocoapods-specs.git,https://cdn.cocoapods.org/
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:

lint_ios_podspec:
name: Lint iOS Podspec
runs-on: macos-14
if: github.event_name == 'pull_request'
runs-on: macos-15
if: (github.event_name == 'push' && github.ref == 'refs/heads/main')
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Lint Podspec
run: pod lib lint --private --verbose --sources=https://github.com/CruGlobal/cocoapods-specs.git,https://cdn.cocoapods.org/
- name: Pod Lib Lint
uses: ./.github/actions/pod-lib-lint

current_version:
name: Store Current Version
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:

push_podspec:
name: Push Podspec
runs-on: macos-14
runs-on: macos-15
if: (github.event_name == 'push' && github.ref == 'refs/heads/main')
needs: [ check_version, tag_version ]
steps:
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/lint-podspec.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Lint Podspec

on:
push:
branches: [ feature/*, versions/* ]
pull_request:
branches: [ feature/*, versions/* ]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
lint_ios_podspec:
name: Lint iOS Podspec
runs-on: macos-15
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Pod Lib Lint
uses: ./.github/actions/pod-lib-lint
6 changes: 3 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ concurrency:
jobs:
run_tests_and_code_coverage:
name: Run Tests and Code Coverage
runs-on: macos-14
runs-on: macos-15
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Select Xcode Version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.4.0'
xcode-version: '16.0.0'
- name: Run Tests
run: xcodebuild test -scheme SocialAuthentication -sdk iphonesimulator17.5 -destination "OS=17.5,name=iPhone 15"
run: xcodebuild test -scheme SocialAuthentication -sdk iphonesimulator18.0 -destination "OS=18.0,name=iPhone 16"
- name: Upload Xcode Code Coverage Report to CodeCov
uses: codecov/codecov-action@v4
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
{
"pins" : [
{
"identity" : "app-check",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/app-check.git",
"state" : {
"revision" : "21fe1af9be463a359aaf8d96789ef73fc3760d09",
"version" : "11.0.1"
}
},
{
"identity" : "appauth-ios",
"kind" : "remoteSourceControl",
Expand All @@ -14,17 +23,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/facebook/facebook-ios-sdk.git",
"state" : {
"revision" : "3fe31c168903759de1c5752d12856c5c437c6862",
"version" : "16.3.1"
"revision" : "b02aef326d67cb332d20a0c3f62cc981f8fc3250",
"version" : "17.3.0"
}
},
{
"identity" : "googlesignin-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleSignIn-iOS.git",
"state" : {
"revision" : "a7965d134c5d3567026c523e0a8a583f73b62b0d",
"version" : "7.1.0"
"revision" : "65fb3f1aa6ffbfdc79c4e22178a55cd91561f5e9",
"version" : "8.0.0"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "53156c7ec267db846e6b64c9f4c4e31ba4cf75eb",
"version" : "8.0.2"
}
},
{
Expand All @@ -44,6 +62,15 @@
"revision" : "5d7d66f647400952b1758b230e019b07c0b4b22a",
"version" : "4.1.1"
}
},
{
"identity" : "promises",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac",
"version" : "2.4.0"
}
}
],
"version" : 2
Expand Down
7 changes: 3 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ let package = Package(
targets: ["SocialAuthentication"]),
],
dependencies: [
.package(url: "https://github.com/facebook/facebook-ios-sdk.git", .upToNextMinor(from: "16.3.1")),
.package(url: "https://github.com/google/GoogleSignIn-iOS.git", .upToNextMinor(from: "7.1.0"))
.package(url: "https://github.com/facebook/facebook-ios-sdk.git", .upToNextMinor(from: "17.3.0")),
.package(url: "https://github.com/google/GoogleSignIn-iOS.git", .upToNextMinor(from: "8.0.0"))
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand All @@ -25,8 +25,7 @@ let package = Package(
.product(name: "FacebookLogin", package: "facebook-ios-sdk"),
.product(name: "GoogleSignIn", package: "GoogleSignIn-iOS")
],
exclude: ["../../Example"],
resources: [.copy("../../Sources/Resources/PrivacyManifest/PrivacyInfo.xcprivacy")]
exclude: ["../../Example"]
),
.testTarget(
name: "SocialAuthenticationTests",
Expand Down
6 changes: 3 additions & 3 deletions SocialAuthentication.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = 'SocialAuthentication'
s.version = '0.5.0'
s.version = '0.6.0'
s.summary = 'Module for obtaining access tokens from social platforms FacebookLogin, GoogleSignIn, and AppleSignIn.'
s.description = 'This module implements Classes for obtaining access tokens from FacebookLogin, GoogleSignIn, and AppleSignIn.'
s.homepage = 'https://github.com/CruGlobal/social-authentication-ios'
Expand All @@ -16,7 +16,7 @@ Pod::Spec.new do |s|

s.source_files = 'Sources/**/*.{swift}'

s.dependency 'FBSDKLoginKit', '~> 16.0.0'
s.dependency 'GoogleSignIn', '~> 7.0.0'
s.dependency 'FBSDKLoginKit', '~> 17.3.0'
s.dependency 'GoogleSignIn', '~> 8.0.0'
end

106 changes: 0 additions & 106 deletions Sources/Resources/PrivacyManifest/PrivacyInfo.xcprivacy

This file was deleted.

Loading