diff --git a/<#TemplateProject#>.podspec b/<#TemplateProject#>.podspec index bcacbea..d20bf0d 100644 --- a/<#TemplateProject#>.podspec +++ b/<#TemplateProject#>.podspec @@ -12,10 +12,10 @@ Pod::Spec.new do |s| s.author = { "<#TemplateName#>" => "<#TemplateEmail#>" } s.source = { :git => "https://github.com/<#TemplateUsername#>/<#TemplateProject#>.git", :tag => s.version.to_s } - s.ios.deployment_target = '9.0' + s.ios.deployment_target = '11.0' s.macos.deployment_target = '10.10' - s.tvos.deployment_target = '9.0' - s.watchos.deployment_target = '2.0' + s.tvos.deployment_target = '11.0' + s.watchos.deployment_target = '4.0' s.source_files = 'Sources/<#TemplateProject#>/*.swift' s.swift_versions = ['5.0'] diff --git a/<#TemplateProject#>.xcodeproj/project.pbxproj b/<#TemplateProject#>.xcodeproj/project.pbxproj index 3990776..6a98a61 100644 --- a/<#TemplateProject#>.xcodeproj/project.pbxproj +++ b/<#TemplateProject#>.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -106,7 +106,7 @@ DD48BCA0270E0F9A00D842BC /* <#TemplateProject#> macOS Tests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "<#TemplateProject#> macOS Tests.xctestplan"; sourceTree = ""; }; DD48BCA1270E0FE200D842BC /* <#TemplateProject#> tvOS Tests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "<#TemplateProject#> tvOS Tests.xctestplan"; sourceTree = ""; }; DD48BCA2270E101D00D842BC /* <#TemplateProject#> watchOS Tests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "<#TemplateProject#> watchOS Tests.xctestplan"; sourceTree = ""; }; - DD3BB7202731ADDA00DB55F8 /* <#TemplateProject#>.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = <#TemplateProject#>.docc; sourceTree = ""; }; + DD3BB7202731ADDA00DB55F8 /* <#TemplateProject#>.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; name = <#TemplateProject#>.docc; path = Sources/<#TemplateProject#>/<#TemplateProject#>.docc; sourceTree = ""; }; DD438A462742D18A00F0A1F6 /* Plists */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Plists; sourceTree = ""; }; DDA42148273E153D00F2B0BC /* github */ = {isa = PBXFileReference; lastKnownFileType = folder; name = github; path = .github; sourceTree = ""; }; DD17A9F9257744BC00D30599 /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = scripts; sourceTree = ""; }; @@ -257,7 +257,7 @@ children = ( DD3BB7202731ADDA00DB55F8 /* <#TemplateProject#>.docc */, ); - path = Documentation; + name = Documentation; sourceTree = ""; }; DD86D55B23D11BA80046E63E /* Supporting Files */ = { @@ -481,7 +481,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1310; - LastUpgradeCheck = 1310; + LastUpgradeCheck = 1401; ORGANIZATIONNAME = <#TemplateUsername#>; ProjectGenerationInfo = { Description = "Xcode Project generated using SomeRandomiOSDev/ProjectTemplate"; @@ -619,6 +619,7 @@ /* Begin PBXShellScriptBuildPhase section */ DD86D56823D11C550046E63E /* Run SwiftLint */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -633,7 +634,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if (echo \"$SKIP_SWIFTLINT\" | grep -iq \"^YES$\"); then\n echo \"SKIP_SWIFTLINT=YES | Skipping SwiftLint\"\nelse\n if which swiftlint >/dev/null; then\n swiftlint\n else\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\n fi\nfi\n"; + shellScript = "export PATH=\"$PATH:/opt/homebrew/bin\"\n\nif (echo \"$SKIP_SWIFTLINT\" | grep -iq \"^YES$\"); then\n echo \"SKIP_SWIFTLINT=YES | Skipping SwiftLint\"\nelse\n if which swiftlint >/dev/null; then\n swiftlint\n else\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\n fi\nfi\n"; }; DD2FBC33258BE8C600DB3211 /* Build XCFramework */ = { isa = PBXShellScriptBuildPhase; @@ -847,7 +848,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -856,10 +857,10 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 11.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Debug; }; @@ -910,7 +911,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -918,11 +919,11 @@ SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 11.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; + WATCHOS_DEPLOYMENT_TARGET = 4.0; }; name = Release; }; @@ -1020,6 +1021,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1048,6 +1050,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -1075,6 +1078,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; INFOPLIST_FILE = "Plists/<#TemplateProject#>Tests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1096,6 +1100,7 @@ CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; INFOPLIST_FILE = "Plists/<#TemplateProject#>Tests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> macOS Tests.xcscheme b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> macOS Tests.xcscheme index 34a24d4..29ab26b 100644 --- a/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> macOS Tests.xcscheme +++ b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> macOS Tests.xcscheme @@ -1,6 +1,6 @@ .xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> macOS.xcscheme b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> macOS.xcscheme index f2c48f5..d7dc5b6 100644 --- a/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> macOS.xcscheme +++ b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> macOS.xcscheme @@ -1,6 +1,6 @@ .xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> tvOS Tests.xcscheme b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> tvOS Tests.xcscheme index b14cccf..fa3d56e 100644 --- a/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> tvOS Tests.xcscheme +++ b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> tvOS Tests.xcscheme @@ -1,6 +1,6 @@ .xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> tvOS.xcscheme b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> tvOS.xcscheme index 27c2b6c..68f26ed 100644 --- a/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> tvOS.xcscheme +++ b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> tvOS.xcscheme @@ -1,6 +1,6 @@ .xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> watchOS Tests.xcscheme b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> watchOS Tests.xcscheme index 2fffd65..d85a487 100644 --- a/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> watchOS Tests.xcscheme +++ b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> watchOS Tests.xcscheme @@ -1,6 +1,6 @@ .xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> watchOS.xcscheme b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> watchOS.xcscheme index ebb025b..06a8bc4 100644 --- a/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> watchOS.xcscheme +++ b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#> watchOS.xcscheme @@ -1,6 +1,6 @@ .xcodeproj/xcshareddata/xcschemes/<#TemplateProject#>.xcscheme b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#>.xcscheme index 16e3039..41063f8 100644 --- a/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#>.xcscheme +++ b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#>.xcscheme @@ -1,6 +1,6 @@ .xcodeproj/xcshareddata/xcschemes/<#TemplateProject#>Tests.xcscheme b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#>Tests.xcscheme index 7ecb25c..73d2b6f 100644 --- a/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#>Tests.xcscheme +++ b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/<#TemplateProject#>Tests.xcscheme @@ -1,6 +1,6 @@ .xcodeproj/xcshareddata/xcschemes/Run SwiftLint.xcscheme b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/Run SwiftLint.xcscheme index 92b0df1..f2fd490 100644 --- a/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/Run SwiftLint.xcscheme +++ b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/Run SwiftLint.xcscheme @@ -1,6 +1,6 @@ .xcodeproj/xcshareddata/xcschemes/XCFramework.xcscheme b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/XCFramework.xcscheme index 19aecc9..0779bbe 100644 --- a/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/XCFramework.xcscheme +++ b/<#TemplateProject#>.xcodeproj/xcshareddata/xcschemes/XCFramework.xcscheme @@ -1,6 +1,6 @@ ", platforms: [ - .iOS("9.0"), + .iOS("11.0"), .macOS("10.10"), - .tvOS("9.0"), - .watchOS("2.0") + .tvOS("11.0"), + .watchOS("4.0") ], products: [ diff --git a/Sources/<#TemplateProject#>/.gitkeep b/Sources/<#TemplateProject#>/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/Documentation/<#TemplateProject#>.docc/<#TemplateProject#>.md b/Sources/<#TemplateProject#>/<#TemplateProject#>.docc/<#TemplateProject#>.md similarity index 100% rename from Documentation/<#TemplateProject#>.docc/<#TemplateProject#>.md rename to Sources/<#TemplateProject#>/<#TemplateProject#>.docc/<#TemplateProject#>.md diff --git a/scripts/env.sh b/scripts/env.sh index a0ae4cf..10bf2f3 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -15,6 +15,6 @@ export INIT_GIT=1 export GIT_USERNAME="$USERNAME" export GIT_NAME="$NAME" export GIT_EMAIL="$EMAIL" -export GIT_GPG="559394823741F655" +export GIT_GPG="94872CB83EF62644" export GIT_SIGN_COMMITS=1 export GIT_SIGN_TAGS=1 diff --git a/scripts/xcframework.sh b/scripts/xcframework.sh index 4a53138..add8901 100755 --- a/scripts/xcframework.sh +++ b/scripts/xcframework.sh @@ -259,12 +259,12 @@ for PLATFORM in "iOS" "iOS Simulator" "Mac Catalyst" "macOS" "tvOS" "tvOS Simula case "$PLATFORM" in "iOS") - ARCHS="armv7 armv7s arm64 arm64e" + ARCHS="arm64 arm64e" ARCHIVE="iphoneos" ;; "iOS Simulator") - ARCHS="i386 x86_64 arm64" + ARCHS="x86_64 arm64" ARCHIVE="iphonesimulator" ;; @@ -294,13 +294,13 @@ for PLATFORM in "iOS" "iOS Simulator" "Mac Catalyst" "macOS" "tvOS" "tvOS Simula "watchOS") SCHEME="${PROJECT_NAME} watchOS" - ARCHS="arm64_32 armv7k" + ARCHS="arm64 arm64_32 armv7k" ARCHIVE="watchos" ;; "watchOS Simulator") SCHEME="${PROJECT_NAME} watchOS" - ARCHS="i386 x86_64 arm64" + ARCHS="x86_64 arm64" ARCHIVE="watchsimulator" ;; esac