Merge pull request #62 from 417-72KI/remove-cocoapods-from-demo

Remove CocoaPods integration from demo app

Demo/Tools/Package.swift

@@ -1,16 +1,16 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "Tools",
-    platforms: [.macOS(.v11)],
+    platforms: [.macOS(.v12)],
     products: [],
     dependencies: [
         .package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.37.0"),
         // It's too heavy to build everytime😅
-        // .package(url: "https://github.com/realm/SwiftLint", from: "0.47.0"),
+        // .package(url: "https://github.com/realm/SwiftLint", from: "0.53.0"),
     ],
     targets: []
 )

Demo/project.yml

@@ -15,8 +15,11 @@ options:
   bundleIdPrefix: io.github.417-72KI
 packages:
   XCGLogger:
-    url: https://github.com/DaveWoodCom/XCGLogger.git
+    url: https://github.com/DaveWoodCom/XCGLogger
     from: 7.0.1
+  # SwiftLint:
+  #   url: https://github.com/realm/SwiftLint
+  #   from: 0.53.0
 targets:
   BuildConfigSwiftDemo:
     type: application
@@ -65,16 +68,10 @@ targets:
           CODE_SIGN_IDENTITY: iPhone Distribution
           PROVISIONING_PROFILE_SPECIFIER: ""
           EXCLUDED_SOURCE_FILE_NAMES: Mock*
+    # buildToolPlugins:
+    #   - plugin: SwiftLintPlugin
+    #     package: SwiftLint
     preBuildScripts:
-      - name: Lint
-        script: |
-          if [ "$ENABLE_PREVIEWS" == "YES" ]; then
-            exit 0
-          fi
-
-          "${SRCROOT}/../scripts/copy-lint-config.sh"
-          "${PODS_ROOT}/SwiftLint/swiftlint"
-        basedOnDependencyAnalysis: false
       - name: BuildConfig.swift
         script: |
           if [ "$ENABLE_PREVIEWS" == "YES" ]; then
@@ -90,11 +87,7 @@ targets:
           else
             ENVIRONMENT='development'
           fi
-          if [ -e ${PODS_ROOT}/BuildConfig.swift/buildconfigswift ]; then
-            ${PODS_ROOT}/BuildConfig.swift/buildconfigswift -o ${SRCROOT}/Libs/BuildConfig_swift -e $ENVIRONMENT ${SRCROOT}/Resources/Config # For CI Run
-          else
-            xcrun -sdk macosx swift run --package-path "${SRCROOT}/.." buildconfigswift -o ${SRCROOT}/Libs/BuildConfig_swift -e $ENVIRONMENT ${SRCROOT}/Resources/Config # For Development
-          fi
+          xcrun -sdk macosx swift run --package-path "${SRCROOT}/.." buildconfigswift -o ${SRCROOT}/Libs/BuildConfig_swift -e $ENVIRONMENT ${SRCROOT}/Resources/Config # For Development
         outputFiles:
           - $(SRCROOT)/Libs/BuildConfig_swift/BuildConfig.generated.swift
         basedOnDependencyAnalysis: false
@@ -116,7 +109,6 @@ targets:
         CFBundleShortVersionString: 1.0
         CFBundleVersion: 1
     settings:
-      INFOPLIST_FILE: BuildConfigSwiftDemoTests/info.plist
       TEST_HOST: $(BUILT_PRODUCTS_DIR)/BuildConfigSwiftDemo.app/BuildConfigSwiftDemo
       CODE_SIGN_STYLE: Automatic
       CODE_SIGN_IDENTITY: iPhone Developer

Makefile

@@ -24,17 +24,10 @@ lint:
 	bundle exec pod spec lint --no-clean --allow-warnings
 
 demo_app_init:
-	@export POD_VERSION="$$(swift run $(executable_name) --version 2>/dev/null)" && \
+	@scripts/copy-lint-config.sh && \
 	cd Demo && \
-	bundle install --quiet 2>/dev/null && \
-	xcrun --sdk macosx swift run -c release --package-path Tools xcodegen && \
-	bundle exec pod install
-
-demo_app_update:
-	@export POD_VERSION="$$(swift run $(executable_name) --version 2>/dev/null)" && \
-	cd Demo && \
-	bundle exec pod update
+	xcrun --sdk macosx swift run -c release --package-path Tools xcodegen
 
 .PHONY: demo
 demo: demo_app_init
-	@xed Demo/BuildConfigSwiftDemo.xcworkspace
+	@xed Demo/BuildConfigSwiftDemo.xcodeproj