Merge pull request #20 from amiantos/more-default-books

Add More Example Games
amiantos · Apr 10, 2023 · 952031a · 952031a
2 parents 5d05480 + 96dc599
commit 952031a
Show file tree

Hide file tree

Showing 7 changed files with 362 additions and 11 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -24,15 +24,15 @@ jobs:
           - uses: actions/cache@v2
             with:
               path: .build/release/swiftformat
-              key: $-linting-swiftformat-$
+              key: linting-swiftformat-0.51.4
           - name: Build nicklockwood/SwiftFormat
             run: |
               if [ -f ".build/release/swiftformat" ]; then
                 if ! [ -x "$(command -v swift-format)" ]; then
                   sudo cp -f .build/release/swiftformat /usr/local/bin/swiftformat
                 fi
               else
-                git clone --depth 1 --branch master https://github.com/nicklockwood/SwiftFormat
+                git clone --depth 1 --branch 0.51.4 https://github.com/nicklockwood/SwiftFormat
                 cd SwiftFormat
                 swift build --disable-sandbox -c release
                 mv .build .. && cd ..

diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,5 +1,6 @@
 disabled_rules:
 - trailing_comma
+- opening_brace
 opt_in_rules:
 - empty_count
 - empty_string

diff --git a/GamebookEngine.xcodeproj/project.pbxproj b/GamebookEngine.xcodeproj/project.pbxproj
@@ -42,6 +42,7 @@
 		44C522EB232F0B6D00E7AC95 /* GamePlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44C522EA232F0B6D00E7AC95 /* GamePlayer.swift */; };
 		44CB58C32326CFB6009E49D9 /* An Introduction to Gamebook Engine.gbook in Resources */ = {isa = PBXBuildFile; fileRef = 44CB58C22326CFB6009E49D9 /* An Introduction to Gamebook Engine.gbook */; };
 		44CB58C523286792009E49D9 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44CB58C423286792009E49D9 /* Logging.swift */; };
+		44DE965929E3C687002E932B /* A Pirate Adventure.gbook in Resources */ = {isa = PBXBuildFile; fileRef = 44DE965829E3C687002E932B /* A Pirate Adventure.gbook */; };
 		B402FFEE2315FEFA00900020 /* MarkdownEditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B402FFEC2315FEFA00900020 /* MarkdownEditorViewController.swift */; };
 		B402FFEF2315FEFA00900020 /* MarkdownEditorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B402FFED2315FEFA00900020 /* MarkdownEditorViewController.xib */; };
 		B402FFF22316055000900020 /* BRMarkdownParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B402FFF12316055000900020 /* BRMarkdownParser.swift */; };
@@ -149,6 +150,7 @@
 		44C522EA232F0B6D00E7AC95 /* GamePlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GamePlayer.swift; sourceTree = "<group>"; };
 		44CB58C22326CFB6009E49D9 /* An Introduction to Gamebook Engine.gbook */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "An Introduction to Gamebook Engine.gbook"; sourceTree = "<group>"; };
 		44CB58C423286792009E49D9 /* Logging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logging.swift; sourceTree = "<group>"; };
+		44DE965829E3C687002E932B /* A Pirate Adventure.gbook */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "A Pirate Adventure.gbook"; sourceTree = "<group>"; };
 		B402FFEC2315FEFA00900020 /* MarkdownEditorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkdownEditorViewController.swift; sourceTree = "<group>"; };
 		B402FFED2315FEFA00900020 /* MarkdownEditorViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MarkdownEditorViewController.xib; sourceTree = "<group>"; };
 		B402FFF12316055000900020 /* BRMarkdownParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BRMarkdownParser.swift; sourceTree = "<group>"; };
@@ -299,6 +301,7 @@
 		44CB58BF2326CDDB009E49D9 /* Built-in Gamebooks */ = {
 			isa = PBXGroup;
 			children = (
+				44DE965829E3C687002E932B /* A Pirate Adventure.gbook */,
 				44CB58C22326CFB6009E49D9 /* An Introduction to Gamebook Engine.gbook */,
 			);
 			path = "Built-in Gamebooks";
@@ -618,6 +621,7 @@
 				44ADBA8923404BBB00855649 /* fileicon-ipad-320px.png in Resources */,
 				B4A13AD6230F6D24004929B8 /* PageEditorDecisionTableViewCell.xib in Resources */,
 				B448875623063A0E000E2FDD /* Assets.xcassets in Resources */,
+				44DE965929E3C687002E932B /* A Pirate Adventure.gbook in Resources */,
 				B4A13AD2230F5B08004929B8 /* PlayDecisionTableViewCell.xib in Resources */,
 				44ADBA8723404BBB00855649 /* fileicon-ipad-64px.png in Resources */,
 				4407F51929DD22C800119893 /* LICENSE in Resources */,
@@ -928,6 +932,9 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = net.amiantos.BRGamebookEngine;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -950,6 +957,9 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = net.amiantos.BRGamebookEngine;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};