Ditch .xcworkspace in favour of standalone .xcodeproj

Awful · Oct 19, 2023 · c561c4d · c561c4d
1 parent eeaa422
commit c561c4d
Show file tree

Hide file tree

Showing 25 changed files with 93 additions and 172 deletions.
diff --git a/Xcode/Awful.xcodeproj/project.pbxproj → Awful.xcodeproj/project.pbxproj b/Xcode/Awful.xcodeproj/project.pbxproj → Awful.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...ace/xcshareddata/swiftpm/Package.resolved → ...ace/xcshareddata/swiftpm/Package.resolved b/...ace/xcshareddata/swiftpm/Package.resolved → ...ace/xcshareddata/swiftpm/Package.resolved
@@ -6,35 +6,35 @@
         "repositoryURL": "https://github.com/Flipboard/FLAnimatedImage",
         "state": {
           "branch": null,
-          "revision": "e7f9fd4681ae41bf6f3056db08af4f401d61da52",
-          "version": "1.0.16"
+          "revision": "d4f07b6f164d53c1212c3e54d6460738b1981e9f",
+          "version": "1.0.17"
         }
       },
       {
         "package": "HTMLReader",
         "repositoryURL": "https://github.com/nolanw/HTMLReader",
         "state": {
           "branch": null,
-          "revision": "ba104cdd80783d9d206f27df6535fffb553c79e2",
-          "version": "2.2.0"
+          "revision": "d4003bf59feead2361f684a372123eae0afe104f",
+          "version": "2.2.1"
         }
       },
       {
         "package": "Lottie",
         "repositoryURL": "https://github.com/airbnb/lottie-ios.git",
         "state": {
           "branch": null,
-          "revision": "d6feea26a370019b4d3a85f5984cb95a2734776f",
-          "version": "4.2.0"
+          "revision": "45517c3cfec9469bbdd4f86e32393c28ae9df0bc",
+          "version": "4.3.3"
         }
       },
       {
         "package": "Nuke",
         "repositoryURL": "https://github.com/kean/Nuke",
         "state": {
           "branch": null,
-          "revision": "472a03c15f39592007d94f25abe554350bc8aa2b",
-          "version": "10.5.1"
+          "revision": "a002b7fd786f2df2ed4333fe73a9727499fd9d97",
+          "version": "10.11.2"
         }
       },
       {
@@ -51,17 +51,17 @@
         "repositoryURL": "https://github.com/mxcl/PromiseKit",
         "state": {
           "branch": null,
-          "revision": "aea48ea1855f5d82e2dffa6027afce3aab8f3dd7",
-          "version": "6.13.3"
+          "revision": "8a98e31a47854d3180882c8068cc4d9381bf382d",
+          "version": "6.22.1"
         }
       },
       {
         "package": "Spectre",
         "repositoryURL": "https://github.com/kylef/Spectre.git",
         "state": {
           "branch": null,
-          "revision": "f717bbce0e19f0129fc001b2b6bed43b70fd8b87",
-          "version": "0.9.1"
+          "revision": "f79d4ecbf8bc4e1579fbd86c3e1d652fb6876c53",
+          "version": "0.9.2"
         }
       },
       {

diff --git a/...roj/xcshareddata/xcschemes/Awful.xcscheme → ...roj/xcshareddata/xcschemes/Awful.xcscheme b/...roj/xcshareddata/xcschemes/Awful.xcscheme → ...roj/xcshareddata/xcschemes/Awful.xcscheme
@@ -57,7 +57,7 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:Awful.xctestplan"
+            reference = "container:Config/Awful.xctestplan"
             default = "YES">
          </TestPlanReference>
       </TestPlans>

diff --git a/...eddata/xcschemes/CopyMarkdownApp.xcscheme → ...eddata/xcschemes/CopyMarkdownApp.xcscheme b/...eddata/xcschemes/CopyMarkdownApp.xcscheme → ...eddata/xcschemes/CopyMarkdownApp.xcscheme
diff --git a/.../xcschemes/CopyMarkdownExtension.xcscheme → .../xcschemes/CopyMarkdownExtension.xcscheme b/.../xcschemes/CopyMarkdownExtension.xcscheme → .../xcschemes/CopyMarkdownExtension.xcscheme
diff --git a/...eddata/xcschemes/Smilie Keyboard.xcscheme → ...eddata/xcschemes/Smilie Keyboard.xcscheme b/...eddata/xcschemes/Smilie Keyboard.xcscheme → ...eddata/xcschemes/Smilie Keyboard.xcscheme
diff --git a/...eddata/xcschemes/SmilieExtractor.xcscheme → ...eddata/xcschemes/SmilieExtractor.xcscheme b/...eddata/xcschemes/SmilieExtractor.xcscheme → ...eddata/xcschemes/SmilieExtractor.xcscheme
diff --git a/...ddata/xcschemes/Smilies Stickers.xcscheme → ...ddata/xcschemes/Smilies Stickers.xcscheme b/...ddata/xcschemes/Smilies Stickers.xcscheme → ...ddata/xcschemes/Smilies Stickers.xcscheme
diff --git a/Awful.xcworkspace/contents.xcworkspacedata b/Awful.xcworkspace/contents.xcworkspacedata
diff --git a/Awful.xcworkspace/xcshareddata/IDETemplateMacros.plist b/Awful.xcworkspace/xcshareddata/IDETemplateMacros.plist
diff --git a/Xcode/Awful.xctestplan → Config/Awful.xctestplan b/Xcode/Awful.xctestplan → Config/Awful.xctestplan
@@ -34,23 +34,15 @@
     {
       "parallelizable" : true,
       "target" : {
-        "containerPath" : "container:..\/AwfulCore",
+        "containerPath" : "container:AwfulCore",
         "identifier" : "AwfulCoreTests",
         "name" : "AwfulCoreTests"
       }
     },
     {
       "parallelizable" : true,
       "target" : {
-        "containerPath" : "container:..\/AwfulScraping",
-        "identifier" : "AwfulScrapingTests",
-        "name" : "AwfulScrapingTests"
-      }
-    },
-    {
-      "parallelizable" : true,
-      "target" : {
-        "containerPath" : "container:..\/Smilies",
+        "containerPath" : "container:Smilies",
         "identifier" : "SmiliesTests",
         "name" : "SmiliesTests"
       }

diff --git a/Xcode/Config/Common-Debug.xcconfig → Config/Common-Debug.xcconfig b/Xcode/Config/Common-Debug.xcconfig → Config/Common-Debug.xcconfig
diff --git a/Xcode/Config/Common-Release.xcconfig → Config/Common-Release.xcconfig b/Xcode/Config/Common-Release.xcconfig → Config/Common-Release.xcconfig
diff --git a/Xcode/Config/Common.xcconfig → Config/Common.xcconfig b/Xcode/Config/Common.xcconfig → Config/Common.xcconfig
@@ -1,7 +1,7 @@
 // Project-level build settings common to all configurations.
 
 // Place for settings that shouldn't be committed, like API keys. See README.md for suggestions.
-#include? "../Local.xcconfig"
+#include? "Local.xcconfig"
 
 ALWAYS_SEARCH_USER_PATHS = NO
 

diff --git a/Xcode/sourcery-config.yml → Config/sourcery.yml b/Xcode/sourcery-config.yml → Config/sourcery.yml
diff --git a/Xcode/beta → Scripts/beta b/Xcode/beta → Scripts/beta
@@ -19,11 +19,11 @@ def attempt_git_push():
     call(['git', 'push'])
 
 
-def build_and_archive(build_dir, workspace, scheme, configuration, platform):
+def build_and_archive(build_dir, xcodeproj, scheme, configuration, platform):
     archive_path = os.path.join(build_dir, 'Awful-' + platform + '.xcarchive')
     if platform == 'catalyst':
         check_call(['xcodebuild',
-                    '-workspace', workspace,
+                    '-project', xcodeproj,
                     '-scheme', scheme,
                     '-configuration', configuration,
                     '-archivePath', archive_path,
@@ -35,7 +35,7 @@ def build_and_archive(build_dir, workspace, scheme, configuration, platform):
                     ])
     else:
         check_call(['xcodebuild',
-                    '-workspace', workspace,
+                    '-project', xcodeproj,
                     '-scheme', scheme,
                     '-configuration', configuration,
                     '-archivePath', archive_path,
@@ -174,10 +174,10 @@ def main():
         create_github_release(tag)
 
     build_dir = os.path.normpath(os.path.join(SCRIPT_DIR, '..', 'build.noindex'))
-    workspace = os.path.normpath(os.path.join(SCRIPT_DIR, '..', 'Awful.xcworkspace'))
+    xcodeproj = os.path.normpath(os.path.join(SCRIPT_DIR, '..', 'Awful.xcodeproj'))
 
     if 'catalyst' in platforms:
-        archive_path = build_and_archive(build_dir, workspace, 'Awful', 'Release', 'catalyst')
+        archive_path = build_and_archive(build_dir, xcodeproj, 'Awful', 'Release', 'catalyst')
 
         if not args.skip_upload:
             (app_path, zip_path) = export_archive(archive_path, build_dir, 'catalyst')
@@ -190,7 +190,7 @@ def main():
 
 
     if 'ios' in platforms:
-        archive_path = build_and_archive(build_dir, workspace, 'Awful', 'Release', 'ios')
+        archive_path = build_and_archive(build_dir, xcodeproj, 'Awful', 'Release', 'ios')
 
         if not args.skip_upload:
             (_, ipa_path) = export_archive(archive_path, build_dir, 'ios')

diff --git a/Xcode/bump → Scripts/bump b/Xcode/bump → Scripts/bump
diff --git a/Xcode/bump.py → Scripts/bump.py b/Xcode/bump.py → Scripts/bump.py
@@ -79,7 +79,7 @@ def bump_version(bumper):
 
     ensure_repo_is_clean()
 
-    xcconfig = os.path.join(script_dir, "Config", "Common.xcconfig")
+    xcconfig = os.path.join(script_dir, "..", "Config", "Common.xcconfig")
     old_bundle_version = read_bundle_version(xcconfig)
 
     new_bundle_version = bumper(old_bundle_version)

diff --git a/Xcode/fix-copyright.rb → Scripts/fix-copyright.rb b/Xcode/fix-copyright.rb → Scripts/fix-copyright.rb
diff --git a/Xcode/submit → Scripts/submit b/Xcode/submit → Scripts/submit
diff --git a/Xcode/submit.py → Scripts/submit.py b/Xcode/submit.py → Scripts/submit.py
diff --git a/Xcode/Awful.xcodeproj/project.xcworkspace/xcshareddata/Awful.xccheckout b/Xcode/Awful.xcodeproj/project.xcworkspace/xcshareddata/Awful.xccheckout
diff --git a/Xcode/ci_scripts/ci_post_clone.sh b/Xcode/ci_scripts/ci_post_clone.sh