Skip to content

Commit

Permalink
Merge pull request #13 from banghuazhao/Banghua-Zhao/task/Config-fast…
Browse files Browse the repository at this point in the history
…lane

Config fastlane
  • Loading branch information
banghuazhao authored Sep 1, 2024
2 parents 932dcd3 + 6fc7de6 commit 730c62f
Show file tree
Hide file tree
Showing 17 changed files with 640 additions and 74 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,6 @@ fastlane/screenshots/**/*.png
fastlane/test_output

Resource/

fastlane/.env
fastlane/*.p8
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source "https://rubygems.org"

gem "fastlane"
220 changes: 220 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.7)
base64
nkf
rexml
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.970.0)
aws-sdk-core (3.202.2)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.159.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.9.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
declarative (0.0.20)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.111.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.3.1)
fastlane (2.222.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored (~> 1.2)
commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 1.0.0)
faraday (~> 1.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-env (>= 1.6.0, < 2.0.0)
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)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (>= 0.1.1, < 1.0.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.5)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.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)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.3)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
rexml
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.7.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.4.0)
google-cloud-storage (1.47.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.31.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.7)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.2)
json (2.7.2)
jwt (2.8.2)
base64
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.15.0)
multipart-post (2.4.1)
nanaimo (0.3.0)
naturally (2.2.1)
nkf (0.2.0)
optparse (0.5.0)
os (1.1.4)
plist (3.7.1)
public_suffix (6.0.1)
rake (13.2.1)
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.3.6)
strscan
rouge (2.0.7)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
security (0.1.5)
signet (0.19.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
naturally
strscan (3.1.0)
terminal-notifier (2.0.0)
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.2)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unicode-display_width (2.5.0)
word_wrap (1.0.0)
xcodeproj (1.25.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (>= 3.3.2, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)

PLATFORMS
ruby
x86_64-darwin-23

DEPENDENCIES
fastlane

BUNDLED WITH
2.5.11
16 changes: 8 additions & 8 deletions SpringFestivalCrush.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
996C6F112431E85700C54425 /* Ox_Level_10.json in Resources */ = {isa = PBXBuildFile; fileRef = 996C6F0C2431E85700C54425 /* Ox_Level_10.json */; };
996C6F122431E85700C54425 /* Ox_Level_9.json in Resources */ = {isa = PBXBuildFile; fileRef = 996C6F0D2431E85700C54425 /* Ox_Level_9.json */; };
996C6F132431E85700C54425 /* Ox_Level_7.json in Resources */ = {isa = PBXBuildFile; fileRef = 996C6F0E2431E85700C54425 /* Ox_Level_7.json */; };
9971C95325FC6705008CFCF9 /* Ads.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9971C95225FC6705008CFCF9 /* Ads.swift */; };
9971C95325FC6705008CFCF9 /* AdManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9971C95225FC6705008CFCF9 /* AdManager.swift */; };
9971C95425FC6705008CFCF9 /* UIFont+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9971C95125FC6705008CFCF9 /* UIFont+Extension.swift */; };
9971C95525FC6705008CFCF9 /* UIButtonLargerArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9971C95025FC6705008CFCF9 /* UIButtonLargerArea.swift */; };
9971C95E25FC6753008CFCF9 /* AppItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9971C95D25FC6753008CFCF9 /* AppItem.swift */; };
Expand Down Expand Up @@ -146,7 +146,7 @@
996C6F0E2431E85700C54425 /* Ox_Level_7.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Ox_Level_7.json; sourceTree = "<group>"; };
9971C95025FC6705008CFCF9 /* UIButtonLargerArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIButtonLargerArea.swift; sourceTree = "<group>"; };
9971C95125FC6705008CFCF9 /* UIFont+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Extension.swift"; sourceTree = "<group>"; };
9971C95225FC6705008CFCF9 /* Ads.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ads.swift; sourceTree = "<group>"; };
9971C95225FC6705008CFCF9 /* AdManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdManager.swift; sourceTree = "<group>"; };
9971C95D25FC6753008CFCF9 /* AppItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppItem.swift; sourceTree = "<group>"; };
9971C97C25FC67FB008CFCF9 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
9971C97D25FC67FC008CFCF9 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -300,7 +300,7 @@
9955DBA323D7E4D2007786D5 /* SKSpriteNode+Extension.swift */,
9955DBDE23D7EA14007786D5 /* Constants.swift */,
9955DBE023D7F84D007786D5 /* Color+Extension.swift */,
9971C95225FC6705008CFCF9 /* Ads.swift */,
9971C95225FC6705008CFCF9 /* AdManager.swift */,
9971C95025FC6705008CFCF9 /* UIButtonLargerArea.swift */,
9971C95125FC6705008CFCF9 /* UIFont+Extension.swift */,
994625BC2C76092000FC2C6A /* SKSpriteNode+Entension.swift */,
Expand Down Expand Up @@ -552,7 +552,7 @@
9971C95425FC6705008CFCF9 /* UIFont+Extension.swift in Sources */,
9971C95525FC6705008CFCF9 /* UIButtonLargerArea.swift in Sources */,
9955DBB123D7E4E4007786D5 /* Tile.swift in Sources */,
9971C95325FC6705008CFCF9 /* Ads.swift in Sources */,
9971C95325FC6705008CFCF9 /* AdManager.swift in Sources */,
9971C95E25FC6753008CFCF9 /* AppItem.swift in Sources */,
9955DBB523D7E4E4007786D5 /* Level.swift in Sources */,
994625B62C74A3D700FC2C6A /* SettingsView.swift in Sources */,
Expand Down Expand Up @@ -725,15 +725,15 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.4.51;
CURRENT_PROJECT_VERSION = 2409011304;
DEVELOPMENT_TEAM = F694X76A5X;
INFOPLIST_FILE = SpringFestivalCrush/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.4.5;
MARKETING_VERSION = 2.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.Banghua-Zhao.Spring-Festival-Crush";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -746,15 +746,15 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.4.51;
CURRENT_PROJECT_VERSION = 2409011304;
DEVELOPMENT_TEAM = F694X76A5X;
INFOPLIST_FILE = SpringFestivalCrush/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.4.5;
MARKETING_VERSION = 2.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.Banghua-Zhao.Spring-Festival-Crush";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down
4 changes: 2 additions & 2 deletions SpringFestivalCrush/Config/Debug.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// Configuration settings file format documentation can be found at:
// https://help.apple.com/xcode/#/dev745c5c974

GADApplicationIdentifier = ca-app-pub-3940256099942544~1458002511
BannerAdUnitID = ca-app-pub-3940256099942544/2435281174
InterstitialAdID = ca-app-pub-3940256099942544/4411468910
GADApplicationIdentifier = ca-app-pub-3940256099942544~1458002511

AppOpenAdID = ca-app-pub-3940256099942544/5575463023
4 changes: 3 additions & 1 deletion SpringFestivalCrush/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<string>$(InterstitialAdID)</string>
<key>BannerAdUnitID</key>
<string>$(BannerAdUnitID)</string>
<key>AppOpenAdID</key>
<string>$(AppOpenAdID)</string>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
Expand All @@ -21,7 +23,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<string>2409011304</string>
<key>GADApplicationIdentifier</key>
<string>$(GADApplicationIdentifier)</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
49 changes: 44 additions & 5 deletions SpringFestivalCrush/Match3GameApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,59 @@
// Copyright Apps Bay Limited. All rights reserved.
//

import SpriteKit
import SwiftUI
import Localize_Swift
import SpriteKit
import SwiftData
import SwiftUI

#if !targetEnvironment(macCatalyst)
import GoogleMobileAds
#endif

@main
struct Match3GameApp: App {
@Environment(\.scenePhase) private var scenePhase

@StateObject
private var gameModel: GameModel
@StateObject
private var settingModel: SettingModel
@StateObject
private var themeModel: ThemeModel

#if !targetEnvironment(macCatalyst)
var ad = OpenAd()
#endif

init() {
_gameModel = StateObject(wrappedValue: GameModel())
_settingModel = StateObject(wrappedValue: SettingModel())
_themeModel = StateObject(wrappedValue: ThemeModel())

#if !targetEnvironment(macCatalyst)
GADMobileAds.sharedInstance().start()
#endif
}

var body: some Scene {
WindowGroup {
MainView()
.modelContainer(RecordManager.shared.container)
.environmentObject(GameModel())
.environmentObject(ThemeModel())
.environmentObject(SettingModel())
.environmentObject(gameModel)
.environmentObject(settingModel)
.environmentObject(themeModel)
.onChange(of: scenePhase) { _, newPhase in
print("scenePhase: \(newPhase)")
#if !targetEnvironment(macCatalyst)
if newPhase == .active {
ad.tryToPresentAd()
ad.appHasEnterBackgroundBefore = false
} else if newPhase == .background {
ad.appHasEnterBackgroundBefore = true
}

#endif
}
}
}
}
Loading

0 comments on commit 730c62f

Please sign in to comment.