Skip to content

Commit 71808cb

Browse files
committed
update GMA iOS Project
1 parent a604fb4 commit 71808cb

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

gma/integration_test/empty.swift

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//
2+
// empty.swift
3+
// integration_test
4+
//
5+
// Created by David Della Bitta on 5/12/22.
6+
// Copyright © 2022 Google. All rights reserved.
7+
//
8+
9+
import Foundation
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//
2+
// Use this file to import your target's public headers that you would like to expose to Swift.
3+
//
4+

gma/integration_test/integration_test.xcodeproj/project.pbxproj

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
D61C5F8E22BABA9C00A79141 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D61C5F8C22BABA9B00A79141 /* Images.xcassets */; };
1515
D61C5F9622BABAD200A79141 /* integration_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = D61C5F9222BABAD100A79141 /* integration_test.cc */; };
1616
D62CCBC022F367140099BE9F /* gmock-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D62CCBBF22F367140099BE9F /* gmock-all.cc */; };
17+
D640F3172819C85800AC956E /* empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = D640F3162819C85800AC956E /* empty.swift */; };
1718
D66B16871CE46E8900E5638A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D66B16861CE46E8900E5638A /* LaunchScreen.storyboard */; };
1819
D67D355822BABD2200292C1D /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = D67D355622BABD2100292C1D /* gtest-all.cc */; };
1920
D6C179E922CB322900C2651A /* ios_app_framework.mm in Sources */ = {isa = PBXBuildFile; fileRef = D6C179E722CB322900C2651A /* ios_app_framework.mm */; };
@@ -34,6 +35,7 @@
3435
D61C5F9222BABAD100A79141 /* integration_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = integration_test.cc; path = src/integration_test.cc; sourceTree = "<group>"; };
3536
D62CCBBF22F367140099BE9F /* gmock-all.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "gmock-all.cc"; path = "external/googletest/src/googlemock/src/gmock-all.cc"; sourceTree = "<group>"; };
3637
D62CCBC122F367320099BE9F /* gmock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gmock.h; path = external/googletest/src/googlemock/include/gmock/gmock.h; sourceTree = "<group>"; };
38+
D640F3162819C85800AC956E /* empty.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = empty.swift; path = src/empty.swift; sourceTree = "<group>"; };
3739
D66B16861CE46E8900E5638A /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
3840
D67D355622BABD2100292C1D /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "gtest-all.cc"; path = "external/googletest/src/googletest/src/gtest-all.cc"; sourceTree = "<group>"; };
3941
D67D355722BABD2100292C1D /* gtest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gtest.h; path = external/googletest/src/googletest/include/gtest/gtest.h; sourceTree = "<group>"; };
@@ -94,6 +96,7 @@
9496
5292271D1C85FB5500C89379 /* src */ = {
9597
isa = PBXGroup;
9698
children = (
99+
D640F3162819C85800AC956E /* empty.swift */,
97100
D62CCBC122F367320099BE9F /* gmock.h */,
98101
D62CCBBF22F367140099BE9F /* gmock-all.cc */,
99102
D67D355622BABD2100292C1D /* gtest-all.cc */,
@@ -149,6 +152,7 @@
149152
529226D11C85F68000C89379 = {
150153
CreatedOnToolsVersion = 6.4;
151154
DevelopmentTeam = EQHXZ8M8AV;
155+
LastSwiftMigration = 1320;
152156
ProvisioningStyle = Automatic;
153157
};
154158
};
@@ -194,6 +198,7 @@
194198
D6C179EA22CB322900C2651A /* ios_firebase_test_framework.mm in Sources */,
195199
D61C5F9622BABAD200A79141 /* integration_test.cc in Sources */,
196200
D6C179E922CB322900C2651A /* ios_app_framework.mm in Sources */,
201+
D640F3172819C85800AC956E /* empty.swift in Sources */,
197202
D6C179F022CB32A000C2651A /* app_framework.cc in Sources */,
198203
D6C179EE22CB323300C2651A /* firebase_test_framework.cc in Sources */,
199204
);
@@ -287,10 +292,10 @@
287292
buildSettings = {
288293
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
289294
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
295+
CLANG_ENABLE_MODULES = YES;
290296
CODE_SIGN_IDENTITY = "iPhone Developer";
291297
CODE_SIGN_STYLE = Automatic;
292298
DEVELOPMENT_TEAM = "";
293-
EXCLUDED_ARCHS = i386;
294299
FRAMEWORK_SEARCH_PATHS = (
295300
"$(inherited)",
296301
"$(PROJECT_DIR)",
@@ -305,9 +310,11 @@
305310
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
306311
);
307312
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
308-
OTHER_LDFLAGS = "$(inherited)";
313+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
309314
PRODUCT_NAME = "$(TARGET_NAME)";
310315
PROVISIONING_PROFILE_SPECIFIER = "";
316+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
317+
SWIFT_VERSION = 5.0;
311318
WRAPPER_EXTENSION = app;
312319
};
313320
name = Debug;
@@ -317,10 +324,10 @@
317324
buildSettings = {
318325
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
319326
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
327+
CLANG_ENABLE_MODULES = YES;
320328
CODE_SIGN_IDENTITY = "iPhone Developer";
321329
CODE_SIGN_STYLE = Automatic;
322330
DEVELOPMENT_TEAM = "";
323-
EXCLUDED_ARCHS = i386;
324331
FRAMEWORK_SEARCH_PATHS = (
325332
"$(inherited)",
326333
"$(PROJECT_DIR)",
@@ -335,9 +342,10 @@
335342
"\"$(SRCROOT)/external/googletest/src/googlemock\"",
336343
);
337344
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
338-
OTHER_LDFLAGS = "$(inherited)";
345+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
339346
PRODUCT_NAME = "$(TARGET_NAME)";
340347
PROVISIONING_PROFILE_SPECIFIER = "";
348+
SWIFT_VERSION = 5.0;
341349
WRAPPER_EXTENSION = app;
342350
};
343351
name = Release;

0 commit comments

Comments
 (0)