From 6bff90faae439378bea09d4cc54c4b5790706372 Mon Sep 17 00:00:00 2001 From: Brad Howes Date: Sat, 2 Nov 2024 22:28:03 +0100 Subject: [PATCH] Fixed warnings Version values now come from `Common.xcconfig` instead of within the project file. --- --NAME--.xcodeproj/project.pbxproj | 29 +--- .../xcshareddata/xcschemes/All.xcscheme | 2 +- .../xcshareddata/xcschemes/Snapshots.xcscheme | 2 +- .../xcshareddata/xcschemes/iOS App.xcscheme | 2 +- .../xcschemes/iOS Extension.xcscheme | 2 +- .../xcshareddata/xcschemes/macOS App.xcscheme | 2 +- .../xcschemes/macOS Extension.xcscheme | 2 +- Configuration/Common.xcconfig | 6 + .../Sources/KernelBridge/KernelBridge.swift | 2 +- Packages/Sources/Parameters/Parameters.swift | 2 +- bumpVersions | 161 ------------------ .../Base.lproj/MainInterface.storyboard | 2 +- iOS/Extension/Info.plist | 2 +- iOS/Extension/ViewController.swift | 4 +- macOS/Extension/Info.plist | 2 +- macOS/Extension/ViewController.swift | 2 +- macOS/Extension/ViewController.xib | 2 +- newRelease | 160 ----------------- readmemod | 25 --- scripts/bumpVersions.py | 53 +++--- 20 files changed, 60 insertions(+), 404 deletions(-) delete mode 100755 bumpVersions delete mode 100755 newRelease delete mode 100755 readmemod diff --git a/--NAME--.xcodeproj/project.pbxproj b/--NAME--.xcodeproj/project.pbxproj index b5678db..99b757d 100644 --- a/--NAME--.xcodeproj/project.pbxproj +++ b/--NAME--.xcodeproj/project.pbxproj @@ -40,6 +40,7 @@ BDC48CFD27B5BB03005974D7 /* KernelBridge in Frameworks */ = {isa = PBXBuildFile; productRef = BDC48CFC27B5BB03005974D7 /* KernelBridge */; }; BDC48CFF27B5BB03005974D7 /* ParameterAddress in Frameworks */ = {isa = PBXBuildFile; productRef = BDC48CFE27B5BB03005974D7 /* ParameterAddress */; }; BDC48D0127B5BB03005974D7 /* Parameters in Frameworks */ = {isa = PBXBuildFile; productRef = BDC48D0027B5BB03005974D7 /* Parameters */; }; + BDD3581E2CD6C973006FFB1B /* Theme in Frameworks */ = {isa = PBXBuildFile; productRef = BDD3581D2CD6C973006FFB1B /* Theme */; }; C433F56122404C7C00F1B750 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C433F56022404C7C00F1B750 /* ViewController.swift */; }; C437FE712223686D008D6C09 /* --NAME--AU.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = C437FE632223686D008D6C09 /* --NAME--AU.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; C4660A602225F9A0007BE3B1 /* --NAME--AU.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = C437FEA0222368B7008D6C09 /* --NAME--AU.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; @@ -188,6 +189,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + BDD3581E2CD6C973006FFB1B /* Theme in Frameworks */, BD8D4E1D27B589FF007011A5 /* ParameterAddress in Frameworks */, BD8D4E1927B589FF007011A5 /* Kernel in Frameworks */, BD8D4E1527B589D4007011A5 /* Knob-iOS in Frameworks */, @@ -427,6 +429,7 @@ BD8D4E1A27B589FF007011A5 /* KernelBridge */, BD8D4E1C27B589FF007011A5 /* ParameterAddress */, BD8D4E1E27B589FF007011A5 /* Parameters */, + BDD3581D2CD6C973006FFB1B /* Theme */, ); productName = "AUv3FilterExtension iOS"; productReference = C437FE632223686D008D6C09 /* --NAME--AU.appex */; @@ -488,7 +491,7 @@ BuildIndependentTargetsInParallel = YES; DefaultBuildSystemTypeForWorkspace = Latest; LastSwiftUpdateCheck = 1240; - LastUpgradeCheck = 1520; + LastUpgradeCheck = 1610; ORGANIZATIONNAME = Apple; TargetAttributes = { BD1D257525D5AAB000523748 = { @@ -840,7 +843,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = BDE2CE1824A3E8DB004AC8FA /* Staging.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; @@ -875,7 +877,6 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20220215161008; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = UP6SS5ES7E; ENABLE_NS_ASSERTIONS = NO; @@ -893,7 +894,6 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.braysoftware.--NAME--"; @@ -945,7 +945,6 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20220215161008; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_NS_ASSERTIONS = NO; @@ -964,7 +963,6 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.1.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.braysoftware.--NAME--.appex"; @@ -984,7 +982,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = BDE2CE1824A3E8DB004AC8FA /* Staging.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; @@ -1020,7 +1017,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20220215161008; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; @@ -1041,7 +1037,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.1.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.braysoftware.--NAME--"; @@ -1092,7 +1087,6 @@ CODE_SIGN_IDENTITY = "Mac Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20220215161008; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; @@ -1113,7 +1107,6 @@ "@executable_path/../Frameworks", "@executable_path/../../../../Frameworks", ); - MARKETING_VERSION = 1.1.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.braysoftware.--NAME--.appex"; @@ -1174,7 +1167,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = BDE2CE1724A3E887004AC8FA /* Dev.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; @@ -1209,7 +1201,6 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20220215161008; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = UP6SS5ES7E; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1233,7 +1224,6 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -1285,7 +1275,6 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20220215161008; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -1310,7 +1299,6 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -1330,7 +1318,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = BDE2CE1724A3E887004AC8FA /* Dev.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; @@ -1366,7 +1353,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20220215161008; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; @@ -1393,7 +1379,6 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 1.1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -1445,7 +1430,6 @@ CODE_SIGN_IDENTITY = "Mac Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 20220215161008; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; @@ -1472,7 +1456,6 @@ "@executable_path/../Frameworks", "@executable_path/../../../../Frameworks", ); - MARKETING_VERSION = 1.1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -1618,6 +1601,10 @@ isa = XCSwiftPackageProductDependency; productName = Parameters; }; + BDD3581D2CD6C973006FFB1B /* Theme */ = { + isa = XCSwiftPackageProductDependency; + productName = Theme; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = C437FE302223672C008D6C09 /* Project object */; diff --git a/--NAME--.xcodeproj/xcshareddata/xcschemes/All.xcscheme b/--NAME--.xcodeproj/xcshareddata/xcschemes/All.xcscheme index ef5589b..b1b3f05 100644 --- a/--NAME--.xcodeproj/xcshareddata/xcschemes/All.xcscheme +++ b/--NAME--.xcodeproj/xcshareddata/xcschemes/All.xcscheme @@ -1,6 +1,6 @@ ', - r'\1"' + displayVersion + r'"\4>', contents) - open(file, 'w').write(contents) - -def runCommand(*args): - process = subprocess.run(args, stdout=subprocess.PIPE, universal_newlines=True) - if process.returncode != 0: - print(process.stdout) - print(process.stderr) - sys.exit(1) - -def locateInfoFiles(): - def cond(name, path): - return name == 'Info.plist' - return locateFiles(cond) - -def updateInfoFiles(infoFiles, marketingVersion): - componentVersion = getComponentVersion(marketingVersion) - log(f"componentVersion - {componentVersion}") - for file in infoFiles: - if file.find('xcarchive') != -1: - continue - - contents = open(file, 'rb').read() - if contents.find(b'NSExtension') == -1: - continue - - log(f"modifying info file '{file}'") - runCommand('PlistBuddy', - file, - '-c', - f'Set :NSExtension:NSExtensionAttributes:AudioComponents:0:version {componentVersion}') - -def setVersion(value): - return list(map(int, value.split('.'))) - -def main(): - parser = argparse.ArgumentParser() - parser.add_argument('-d', '--dir', help='DIR to process') - group = parser.add_mutually_exclusive_group() - group.add_argument('-1', '--major', action='store_true', help='bump major version') - group.add_argument('-2', '--minor', action='store_true', help='bump minor version') - group.add_argument('-3', '--patch', action='store_true', help='bump patch version') - group.add_argument('-b', '--build', action='store_true', help='set the build version') - group.add_argument('-s', '--set', help='set the version') - args = parser.parse_args() - - if args.dir: - log(f"working in directory '{args.dir}'") - os.chdir(args.dir) - - projectFiles = locateProjectFiles() - marketingVersion = getCurrentMarketingVersion(projectFiles) - projectVersion = getNewProjectVersion() - log(f"projectVersion - {projectVersion}") - - if args.set: - marketingVersion = list(map(int, args.set.split('.'))) - if args.major: - marketingVersion = bumpMajor(marketingVersion) - if args.minor: - marketingVersion = bumpMinor(marketingVersion) - if args.patch: - marketingVersion = bumpPatch(marketingVersion) - log(f"marketingVersion - {getVersionString(marketingVersion)}") - - updateProjectFiles(projectFiles, marketingVersion, projectVersion) - updateUIFiles(locateUIFiles(), marketingVersion) - updateInfoFiles(locateInfoFiles(), marketingVersion) - - open(".version", "w").write(getVersionString(marketingVersion) + '\n') - -if __name__ == '__main__': - main() diff --git a/iOS/Extension/Base.lproj/MainInterface.storyboard b/iOS/Extension/Base.lproj/MainInterface.storyboard index b3b8dcf..6393e15 100644 --- a/iOS/Extension/Base.lproj/MainInterface.storyboard +++ b/iOS/Extension/Base.lproj/MainInterface.storyboard @@ -22,7 +22,7 @@ -