Skip to content

Commit

Permalink
Merge branch 'main' into GHACacheUpdate
Browse files Browse the repository at this point in the history
  • Loading branch information
@ppeelen
ppeelen authored Aug 9, 2024
2 parents 483eda2 + 81e3a63 commit 4b710dd
Show file tree
Hide file tree
Showing 49 changed files with 673 additions and 120 deletions.
4 changes: 2 additions & 2 deletions Shared/Config/xcconfig/Project-Shared.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// https://buildsettingextractor.com
//

MARKETING_VERSION = 3.0.0
MARKETING_VERSION = 3.1.0

ALWAYS_SEARCH_USER_PATHS = NO
CLANG_ANALYZER_NONNULL = YES
Expand Down Expand Up @@ -46,6 +46,6 @@ GCC_WARN_UNDECLARED_SELECTOR = YES
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE
GCC_WARN_UNUSED_FUNCTION = YES
GCC_WARN_UNUSED_VARIABLE = YES
IPHONEOS_DEPLOYMENT_TARGET = 16.4
IPHONEOS_DEPLOYMENT_TARGET = 17.0
MTL_FAST_MATH = YES
SDKROOT = iphoneos
2 changes: 1 addition & 1 deletion Shared/Config/xcconfig/SwiftIslandApp/SwiftIslandApp-Shared.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES
INFOPLIST_KEY_UILaunchScreen_Generation = YES
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown
IPHONEOS_DEPLOYMENT_TARGET = 16.4
IPHONEOS_DEPLOYMENT_TARGET = 17.0
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks
PRODUCT_BUNDLE_IDENTIFIER = nl.swiftisland.app
PRODUCT_NAME = Swift Island
Expand Down
2 changes: 1 addition & 1 deletion Shared/Config/xcconfig/SwiftIslandAppTests/SwiftIslandAppTests-Shared.xcconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CODE_SIGN_STYLE = Automatic
CURRENT_PROJECT_VERSION = 1
DEVELOPMENT_TEAM = V38QRBT6X5
GENERATE_INFOPLIST_FILE = YES
IPHONEOS_DEPLOYMENT_TARGET = 16.4
IPHONEOS_DEPLOYMENT_TARGET = 17.0
PRODUCT_BUNDLE_IDENTIFIER = se.apptrix.SwiftIslandTests
PRODUCT_NAME = $(TARGET_NAME)
SWIFT_EMIT_LOC_STRINGS = NO
Expand Down
12 changes: 6 additions & 6 deletions SwiftIslandApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -1172,7 +1172,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1207,7 +1207,7 @@
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1250,7 +1250,7 @@
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1278,7 +1278,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = V38QRBT6X5;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MARKETING_VERSION = "${MARKETING_VERSION}";
PRODUCT_BUNDLE_IDENTIFIER = se.apptrix.SwiftIslandTests;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1299,7 +1299,7 @@
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = V38QRBT6X5;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.4;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MARKETING_VERSION = "${MARKETING_VERSION}";
PRODUCT_BUNDLE_IDENTIFIER = se.apptrix.SwiftIslandTests;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
28 changes: 14 additions & 14 deletions SwiftIslandApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/app-check.git",
"state" : {
"revision" : "076b241a625e25eac22f8849be256dfb960fcdfe",
"version" : "10.19.1"
"revision" : "3b62f154d00019ae29a71e9738800bb6f18b236d",
"version" : "10.19.2"
}
},
{
Expand Down Expand Up @@ -59,17 +59,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk.git",
"state" : {
"revision" : "9d17b500cd98d9a7009751ad62f802e152e97021",
"version" : "10.26.0"
"revision" : "eca84fd638116dd6adb633b5a3f31cc7befcbb7d",
"version" : "10.29.0"
}
},
{
"identity" : "googleappmeasurement",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleAppMeasurement.git",
"state" : {
"revision" : "16244d177c4e989f87b25e9db1012b382cfedc55",
"version" : "10.25.0"
"revision" : "fe727587518729046fc1465625b9afd80b5ab361",
"version" : "10.28.0"
}
},
{
Expand Down Expand Up @@ -104,8 +104,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"revision" : "0382ca27f22fb3494cf657d8dc356dc282cd1193",
"version" : "3.4.1"
"revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
"version" : "3.5.0"
}
},
{
Expand Down Expand Up @@ -158,17 +158,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser.git",
"state" : {
"revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
"version" : "1.4.0"
"revision" : "41982a3656a71c768319979febd796c6fd111d5c",
"version" : "1.5.0"
}
},
{
"identity" : "swift-protobuf",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
"version" : "1.26.0"
"revision" : "d57a5aecf24a25b32ec4a74be2f5d0a995a47c4b",
"version" : "1.27.0"
}
},
{
Expand Down Expand Up @@ -212,8 +212,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/jpsim/Yams.git",
"state" : {
"revision" : "9234124cff5e22e178988c18d8b95a8ae8007f76",
"version" : "5.1.2"
"revision" : "3036ba9d69cf1fd04d433527bc339dc0dc75433d",
"version" : "5.1.3"
}
}
],
Expand Down
Binary file removed ...slandApp/Assets.xcassets/Conference/Mentors/AndreyVolodin.imageset/IMG_0353.jpg
View file
Binary file not shown.
Binary file removed ...andApp/Assets.xcassets/Conference/Mentors/JordiBruin.imageset/1685451387216.jpg
View file
Binary file not shown.
Binary file removed SwiftIslandApp/Assets.xcassets/Conference/Mentors/MaximCramer.imageset/maxim_.jpg
View file
Binary file not shown.
Binary file removed ...dApp/Assets.xcassets/Conference/Mentors/NataliyaMarmelstein.imageset/image1.jpg
View file
Binary file not shown.
12 changes: 0 additions & 12 deletions SwiftIslandApp/Assets.xcassets/Conference/Mentors/SofiaLarsson.imageset/Contents.json
View file

This file was deleted.

Binary file removed ...sets.xcassets/Conference/Mentors/SofiaLarsson.imageset/Social Profile Image.jpg
View file
Binary file not shown.
12 changes: 0 additions & 12 deletions SwiftIslandApp/Assets.xcassets/Conference/Mentors/SofíaSwidarowicz.imageset/Contents.json
View file

This file was deleted.

Binary file removed ...App/Assets.xcassets/Conference/Mentors/SofíaSwidarowicz.imageset/sofia-sw-1.jpg
View file
Binary file not shown.
Binary file removed SwiftIslandApp/Assets.xcassets/Conference/Mentors/TomLokhorst.imageset/Tom-1.jpg
View file
Binary file not shown.
12 changes: 0 additions & 12 deletions SwiftIslandApp/Assets.xcassets/Conference/Mentors/VincentPradeilles.imageset/Contents.json
View file

This file was deleted.

Binary file removed .../Assets.xcassets/Conference/Mentors/VincentPradeilles.imageset/output copie.jpg
View file
Binary file not shown.
12 changes: 12 additions & 0 deletions SwiftIslandApp/Assets.xcassets/Conference/Mentors/speaker-audrey-2024.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "speaker-audrey-2024.jpg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...cassets/Conference/Mentors/speaker-audrey-2024.imageset/speaker-audrey-2024.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions SwiftIslandApp/Assets.xcassets/Conference/Mentors/speaker-aviel-2024.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "speaker-aviel-2024.jpeg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...xcassets/Conference/Mentors/speaker-aviel-2024.imageset/speaker-aviel-2024.jpeg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions ...IslandApp/Assets.xcassets/Conference/Mentors/speaker-francine-2024.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "speaker-francine-2024.jpg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...ets/Conference/Mentors/speaker-francine-2024.imageset/speaker-francine-2024.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions ...tIslandApp/Assets.xcassets/Conference/Mentors/speaker-jolanda-2024.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "speaker-jolanda-2024.jpg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...ssets/Conference/Mentors/speaker-jolanda-2024.imageset/speaker-jolanda-2024.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ...ataliyaMarmelstein.imageset/Contents.json → ...speaker-malin-2024.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "image1.jpg",
"filename" : "speaker-malin-2024.jpg",
"idiom" : "universal"
}
],
Expand Down
Binary file added ....xcassets/Conference/Mentors/speaker-malin-2024.imageset/speaker-malin-2024.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ...tors/AndreyVolodin.imageset/Contents.json → .../speaker-manu-2024.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "IMG_0353.jpg",
"filename" : "speaker-manu-2024.png",
"idiom" : "universal"
}
],
Expand Down
Binary file added ...ts.xcassets/Conference/Mentors/speaker-manu-2024.imageset/speaker-manu-2024.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions ...tIslandApp/Assets.xcassets/Conference/Mentors/speaker-mikaela-2024.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "speaker-mikaela-2024.jpg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...ssets/Conference/Mentors/speaker-mikaela-2024.imageset/speaker-mikaela-2024.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ...Mentors/JordiBruin.imageset/Contents.json → ...speaker-nizar-2024.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "1685451387216.jpg",
"filename" : "speaker-nizar-2024.jpg",
"idiom" : "universal"
}
],
Expand Down
Binary file added ....xcassets/Conference/Mentors/speaker-nizar-2024.imageset/speaker-nizar-2024.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ...entors/MaximCramer.imageset/Contents.json → .../speaker-paul-2024.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "maxim_.jpg",
"filename" : "speaker-paul-2024.jpg",
"idiom" : "universal"
}
],
Expand Down
Binary file added ...ts.xcassets/Conference/Mentors/speaker-paul-2024.imageset/speaker-paul-2024.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions SwiftIslandApp/Assets.xcassets/Conference/Mentors/speaker-zeyad-2024.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "speaker-zeyad-2024.jpg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ....xcassets/Conference/Mentors/speaker-zeyad-2024.imageset/speaker-zeyad-2024.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions SwiftIslandApp/Assets.xcassets/Social/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
12 changes: 12 additions & 0 deletions SwiftIslandApp/Assets.xcassets/Social/X.symbolset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"info" : {
"author" : "xcode",
"version" : 1
},
"symbols" : [
{
"filename" : "X Social Network.svg",
"idiom" : "universal"
}
]
}
Loading

0 comments on commit 4b710dd

Please sign in to comment.