Skip to content

Commit

Permalink
⬆️ Update required version of Firebase
Browse files Browse the repository at this point in the history
  • Loading branch information
olejnjak committed Dec 7, 2023
1 parent 2f1a1ce commit 3d701f7
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 31 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: SPM tests
runs-on: macos-13
steps:
- uses: actions/checkout@v3.5.3
- uses: actions/checkout@v4
- uses: AckeeCZ/[email protected]
- uses: actions/cache@v3
with:
Expand All @@ -21,9 +21,9 @@ jobs:
name: Carthage build
runs-on: macos-13
steps:
- uses: actions/checkout@v3.5.3
- uses: actions/checkout@v4
- uses: AckeeCZ/[email protected]
- uses: actions/cache@v3.3.1
- uses: actions/cache@v3
with:
path: Carthage
key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
Expand All @@ -40,9 +40,9 @@ jobs:
run:
working-directory: ./ProjectTemplate
steps:
- uses: actions/checkout@v3.5.3
- uses: actions/checkout@v4
- uses: AckeeCZ/[email protected]
- uses: actions/cache@v3.3.1
- uses: actions/cache@v3
with:
path: Carthage
key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Changelog
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.3
- uses: actions/checkout@v4
- name: Changelog Reminder
uses: peterjgrainger/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
Expand Down
2 changes: 1 addition & 1 deletion .github/xcode-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.3.1
15.0.1
4 changes: 0 additions & 4 deletions AckeeTemplate.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
/* Begin PBXBuildFile section */
695155382A647B4C00A5C43D /* nanopb.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6951552A2A647B4C00A5C43D /* nanopb.xcframework */; };
6951553A2A647B4C00A5C43D /* FirebaseABTesting.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6951552B2A647B4C00A5C43D /* FirebaseABTesting.xcframework */; };
6951553C2A647B4C00A5C43D /* FirebaseRemoteConfigSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6951552C2A647B4C00A5C43D /* FirebaseRemoteConfigSwift.xcframework */; };
6951553E2A647B4C00A5C43D /* FBLPromises.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6951552D2A647B4C00A5C43D /* FBLPromises.xcframework */; };
695155402A647B4C00A5C43D /* FirebaseAnalytics.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6951552E2A647B4C00A5C43D /* FirebaseAnalytics.xcframework */; };
695155422A647B4C00A5C43D /* FirebaseCoreInternal.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6951552F2A647B4C00A5C43D /* FirebaseCoreInternal.xcframework */; };
695155442A647B4C00A5C43D /* FirebaseSharedSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 695155302A647B4C00A5C43D /* FirebaseSharedSwift.xcframework */; };
695155462A647B4C00A5C43D /* FirebaseAnalyticsSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 695155312A647B4C00A5C43D /* FirebaseAnalyticsSwift.xcframework */; };
695155482A647B4C00A5C43D /* GoogleAppMeasurementIdentitySupport.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 695155322A647B4C00A5C43D /* GoogleAppMeasurementIdentitySupport.xcframework */; };
6951554A2A647B4C00A5C43D /* FirebaseInstallations.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 695155332A647B4C00A5C43D /* FirebaseInstallations.xcframework */; };
6951554C2A647B4C00A5C43D /* GoogleAppMeasurement.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 695155342A647B4C00A5C43D /* GoogleAppMeasurement.xcframework */; };
Expand Down Expand Up @@ -177,11 +175,9 @@
6951553E2A647B4C00A5C43D /* FBLPromises.xcframework in Frameworks */,
695155742A647E7D00A5C43D /* AckeeTemplate.framework in Frameworks */,
695155502A647B4C00A5C43D /* FirebaseCore.xcframework in Frameworks */,
695155462A647B4C00A5C43D /* FirebaseAnalyticsSwift.xcframework in Frameworks */,
695155482A647B4C00A5C43D /* GoogleAppMeasurementIdentitySupport.xcframework in Frameworks */,
695155422A647B4C00A5C43D /* FirebaseCoreInternal.xcframework in Frameworks */,
6951554A2A647B4C00A5C43D /* FirebaseInstallations.xcframework in Frameworks */,
6951553C2A647B4C00A5C43D /* FirebaseRemoteConfigSwift.xcframework in Frameworks */,
6951554C2A647B4C00A5C43D /* GoogleAppMeasurement.xcframework in Frameworks */,
6951553A2A647B4C00A5C43D /* FirebaseABTesting.xcframework in Frameworks */,
695155382A647B4C00A5C43D /* nanopb.xcframework in Frameworks */,
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Changelog

## Next
- new build settings defaults, add app icon, update Tuist plugin ([#74](https://github.com/AckeeCZ/iOS-MVVM-ProjectTemplate/pull/74), kudos to @olejnjak)
- Updates ([#74](https://github.com/AckeeCZ/iOS-MVVM-ProjectTemplate/pull/74), kudos to @olejnjak)
- new build settings defaults
- add app icon
- update Tuist plugin
- require Firebase 10.19+ as it introduced some breaking changes

## 1.0.0

Expand Down
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" ~> 10.12
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" ~> 10.12
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" ~> 10.19
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" ~> 10.19
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "10.12.0"
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" "10.12.0"
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "10.19.0"
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json" "10.19.0"
42 changes: 30 additions & 12 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -9,49 +9,58 @@
"version" : "1.2022062300.0"
}
},
{
"identity" : "app-check",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/app-check.git",
"state" : {
"revision" : "5746b2d35c91c50581590ed97abe4c06b5037274",
"version" : "10.18.0"
}
},
{
"identity" : "firebase-ios-sdk",
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk",
"state" : {
"revision" : "a580250a9ff49ec38da5430cef20f88ddc831db2",
"version" : "10.12.0"
"revision" : "d9bcd141c3e4ad48a9500e6faeebb073f43cbcbd",
"version" : "10.19.0"
}
},
{
"identity" : "googleappmeasurement",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleAppMeasurement.git",
"state" : {
"revision" : "0a226a8c50494c4cb877fbde27ab6374520a3354",
"version" : "10.12.0"
"revision" : "6b332152355c372ace9966d8ee76ed191f97025e",
"version" : "10.17.0"
}
},
{
"identity" : "googledatatransport",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleDataTransport.git",
"state" : {
"revision" : "98a00258d4518b7521253a70b7f70bb76d2120fe",
"version" : "9.2.4"
"revision" : "a732a4b47f59e4f725a2ea10f0c77e93a7131117",
"version" : "9.3.0"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "58d03d22beae762eaddbd30cb5a61af90d4b309f",
"version" : "7.11.3"
"revision" : "bc27fad73504f3d4af235de451f02ee22586ebd3",
"version" : "7.12.1"
}
},
{
"identity" : "grpc-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/grpc-binary.git",
"state" : {
"revision" : "f1b366129d1125be7db83247e003fc333104b569",
"version" : "1.50.2"
"revision" : "a673bc2937fbe886dd1f99c401b01b6d977a9c98",
"version" : "1.49.1"
}
},
{
Expand All @@ -63,6 +72,15 @@
"version" : "3.1.1"
}
},
{
"identity" : "interop-ios-for-google-sdks",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/interop-ios-for-google-sdks.git",
"state" : {
"revision" : "2d12673670417654f08f5f90fdd62926dc3a2648",
"version" : "100.0.0"
}
},
{
"identity" : "leveldb",
"kind" : "remoteSourceControl",
Expand All @@ -86,8 +104,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "ec957ccddbcc710ccc64c9dcbd4c7006fcf8b73a",
"version" : "2.2.0"
"revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e",
"version" : "2.3.1"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ let package = Package(
dependencies: [
.package(
url: "https://github.com/firebase/firebase-ios-sdk",
.upToNextMajor(from: "10.12.0")
.upToNextMajor(from: "10.19.0")
),
],
targets: [
Expand Down
1 change: 0 additions & 1 deletion Sources/FirebaseFetcher/FirebaseFetcher.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import AckeeTemplate
import FirebaseRemoteConfig
import FirebaseRemoteConfigSwift

public final class FirebaseFetcher: MinBuildNumberFetcher {
public var minBuildNumber: Int {
Expand Down

0 comments on commit 3d701f7

Please sign in to comment.