Skip to content

Commit 4fa23e2

Browse files
hye0njuoohye0njuoo
committed
[release] 2.1.3
2 parents a580471 + b6a1086 commit 4fa23e2

File tree

16 files changed

+454
-101
lines changed

16 files changed

+454
-101
lines changed

‎Hilingual.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
1988F8F82B0F4E84A7827BF3 /* HilingualCore in Frameworks */ = {isa = PBXBuildFile; productRef = 0512DDBB07374DA5A2F41BA2 /* HilingualCore */; };
11+
3A1464192F59BD11001D047C /* GoogleMobileAds in Frameworks */ = {isa = PBXBuildFile; productRef = 3A1464182F59BD11001D047C /* GoogleMobileAds */; };
1112
E51B4C542E28DC11000B16D0 /* AppIcon.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E51B4C532E28DC11000B16D0 /* AppIcon.xcassets */; };
1213
E51DB2052E1D9E8B000C2BEA /* AppConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = E51DB2042E1D9E8B000C2BEA /* AppConfig.swift */; };
1314
E51DB2242E1E4407000C2BEA /* AppBaseURLProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = E51DB2232E1E4407000C2BEA /* AppBaseURLProvider.swift */; };
@@ -69,6 +70,7 @@
6970
E5CBCFB42EC4B3E100475E81 /* FirebaseCore in Frameworks */,
7071
E5C2F3992E171575003DF6C4 /* HilingualDomain in Frameworks */,
7172
1988F8F82B0F4E84A7827BF3 /* HilingualCore in Frameworks */,
73+
3A1464192F59BD11001D047C /* GoogleMobileAds in Frameworks */,
7274
E5CBCFB62EC4B3E100475E81 /* FirebaseRemoteConfig in Frameworks */,
7375
E5C2F3952E170A01003DF6C4 /* HilingualNetwork in Frameworks */,
7476
E5D5D0AC2E17289000DABE8D /* HilingualPresentation in Frameworks */,
@@ -168,6 +170,7 @@
168170
E5D5D0AB2E17289000DABE8D /* HilingualPresentation */,
169171
E5CBCFB32EC4B3E100475E81 /* FirebaseCore */,
170172
E5CBCFB52EC4B3E100475E81 /* FirebaseRemoteConfig */,
173+
3A1464182F59BD11001D047C /* GoogleMobileAds */,
171174
);
172175
productName = Hilingual;
173176
productReference = E5C79B0E2E15281900E461C3 /* Hilingual-Dev.app */;
@@ -199,6 +202,7 @@
199202
minimizedProjectReferenceProxies = 1;
200203
packageReferences = (
201204
E5CBCFB22EC4B3E100475E81 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
205+
3A1464172F59BD11001D047C /* XCRemoteSwiftPackageReference "swift-package-manager-google-mobile-ads" */,
202206
);
203207
preferredProjectObjectVersion = 77;
204208
productRefGroup = E5C79B0F2E15281900E461C3 /* Products */;
@@ -261,6 +265,7 @@
261265
BUNDLE_ID_SUFFIX = .dev;
262266
BUNDLE_NAME = "Hilingual-Dev";
263267
CODE_SIGN_ENTITLEMENTS = Hilingual/Hilingual.entitlements;
268+
CODE_SIGN_IDENTITY = "Apple Development";
264269
CODE_SIGN_STYLE = Automatic;
265270
CURRENT_PROJECT_VERSION = 2025022201;
266271
DEVELOPMENT_TEAM = C9XX799UJH;
@@ -281,11 +286,12 @@
281286
MARKETING_VERSION = 2.1.2;
282287
PRODUCT_BUNDLE_IDENTIFIER = "com.Hilingual$(BUNDLE_ID_SUFFIX)";
283288
PRODUCT_NAME = "Hilingual-Dev";
289+
PROVISIONING_PROFILE_SPECIFIER = "";
284290
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
285291
SUPPORTS_MACCATALYST = NO;
286292
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
287293
SWIFT_EMIT_LOC_STRINGS = YES;
288-
SWIFT_VERSION = 5.0;
294+
SWIFT_VERSION = 6.0;
289295
TARGETED_DEVICE_FAMILY = 1;
290296
};
291297
name = Debug;
@@ -299,6 +305,7 @@
299305
BUNDLE_ID_SUFFIX = "";
300306
BUNDLE_NAME = Hilingual;
301307
CODE_SIGN_ENTITLEMENTS = Hilingual/Hilingual.entitlements;
308+
CODE_SIGN_IDENTITY = "Apple Development";
302309
CODE_SIGN_STYLE = Automatic;
303310
CURRENT_PROJECT_VERSION = 2025022201;
304311
DEVELOPMENT_TEAM = C9XX799UJH;
@@ -319,11 +326,12 @@
319326
MARKETING_VERSION = 2.1.2;
320327
PRODUCT_BUNDLE_IDENTIFIER = "com.Hilingual$(BUNDLE_ID_SUFFIX)";
321328
PRODUCT_NAME = "$(TARGET_NAME)";
329+
PROVISIONING_PROFILE_SPECIFIER = "";
322330
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
323331
SUPPORTS_MACCATALYST = NO;
324332
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
325333
SWIFT_EMIT_LOC_STRINGS = YES;
326-
SWIFT_VERSION = 5.0;
334+
SWIFT_VERSION = 6.0;
327335
TARGETED_DEVICE_FAMILY = 1;
328336
};
329337
name = Release;
@@ -473,6 +481,14 @@
473481
/* End XCConfigurationList section */
474482

475483
/* Begin XCRemoteSwiftPackageReference section */
484+
3A1464172F59BD11001D047C /* XCRemoteSwiftPackageReference "swift-package-manager-google-mobile-ads" */ = {
485+
isa = XCRemoteSwiftPackageReference;
486+
repositoryURL = "https://github.com/googleads/swift-package-manager-google-mobile-ads.git";
487+
requirement = {
488+
kind = upToNextMajorVersion;
489+
minimumVersion = 13.1.0;
490+
};
491+
};
476492
E5CBCFB22EC4B3E100475E81 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
477493
isa = XCRemoteSwiftPackageReference;
478494
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
@@ -488,6 +504,11 @@
488504
isa = XCSwiftPackageProductDependency;
489505
productName = HilingualCore;
490506
};
507+
3A1464182F59BD11001D047C /* GoogleMobileAds */ = {
508+
isa = XCSwiftPackageProductDependency;
509+
package = 3A1464172F59BD11001D047C /* XCRemoteSwiftPackageReference "swift-package-manager-google-mobile-ads" */;
510+
productName = GoogleMobileAds;
511+
};
491512
E5C2F3942E170A01003DF6C4 /* HilingualNetwork */ = {
492513
isa = XCSwiftPackageProductDependency;
493514
productName = HilingualNetwork;

‎Hilingual.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Hilingual/App/AppDIContainer.swift‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import HilingualPresentation
1414

1515
// MARK: - DIContainer Entry Point
1616

17+
@MainActor
1718
final class AppDIContainer: ViewControllerFactory {
1819

1920
static let shared = AppDIContainer()
@@ -23,7 +24,7 @@ final class AppDIContainer: ViewControllerFactory {
2324
}
2425

2526
private func injectBaseURL() {
26-
NetworkEnvironment.shared = AppBaseURLProvider()
27+
NetworkEnvironment.configure(AppBaseURLProvider())
2728
}
2829

2930
public func makeTabBarViewController() -> HilingualPresentation.TabBarViewController {
@@ -34,7 +35,6 @@ final class AppDIContainer: ViewControllerFactory {
3435
return SplashViewController(viewModel: makeSplashViewModel(), diContainer: self)
3536
}
3637

37-
@MainActor
3838
public func makeHomeViewController() -> HomeViewController {
3939
return HomeViewController(viewModel: makeHomeViewModel(), diContainer: self)
4040
}
@@ -79,7 +79,6 @@ final class AppDIContainer: ViewControllerFactory {
7979
return OnBoardingViewController(viewModel: makeOnBoardingViewModel(), diContainer: self)
8080
}
8181

82-
@MainActor
8382
func makeDiaryWritingViewController(
8483
topicData: (String, String)?,
8584
selectedDate: Date,
@@ -308,7 +307,6 @@ extension AppDIContainer {
308307
}
309308

310309
// MARK: - TemporaryDiaryDIContainer
311-
@MainActor
312310
extension AppDIContainer {
313311

314312
private func makeDiaryDraftLocalDataSource() -> DiaryDraftLocalDataSource {
@@ -445,7 +443,6 @@ extension AppDIContainer {
445443
return DefaultHomeUseCase(repository: makeHomeRepository())
446444
}
447445

448-
@MainActor
449446
private func makeHomeViewModel() -> HomeViewModel {
450447
return HomeViewModel(useCase: makeHomeUseCase(), fetchTemporaryDiaryUseCase: makeFetchTemporaryDiaryUseCase(), localPushUseCase: makeLocalPushUseCase())
451448
}
@@ -780,6 +777,5 @@ extension AppDIContainer {
780777
private func makeEditProfileViewModel() -> EditProfileViewModel {
781778
return EditProfileViewModel(fetchUserProfileUseCase: makefetchUserProfileUseCase(), uploadImageUseCase: makeUploadImageUseCase(), mypageUseCase: makeMypageUseCase())
782779
}
783-
784780
}
785781

‎Hilingual/App/AppDelegate.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import UIKit
99
import FirebaseCore
10+
import GoogleMobileAds
1011
import HilingualData
1112

1213
@main
@@ -15,6 +16,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1516
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1617
// Override point for customization after application launch.
1718
FirebaseApp.configure()
19+
// TODO: 광고 기능 재활성화 시 GoogleMobileAds 초기화 복구
20+
// MobileAds.shared.start()
1821
UIFont.registerPretendardFonts()
1922

2023
// for key in UserDefaults.standard.dictionaryRepresentation().keys {
@@ -42,4 +45,3 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
4245

4346

4447
}
45-

0 commit comments

Comments
 (0)