Skip to content

meta: correct version setting #5139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 25 commits into
base: armcknight/ci/ios-swift-cleanup
Choose a base branch
from
Draft

meta: correct version setting #5139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
88c38c7
wip
armcknight Apr 18, 2025
d56ca9f
use a single source of truth for configured version using correct set…
armcknight Apr 18, 2025
5a9ce79
Merge branch 'armcknight/ci/ios13-swift-xcodegen' into armcknight/met…
armcknight Apr 22, 2025
87ac816
Merge branch 'armcknight/ci/ios13-swift-xcodegen' into armcknight/met…
armcknight Apr 22, 2025
1380963
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 22, 2025
0d24400
use the new central versioning config file
armcknight Apr 22, 2025
5c72017
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 22, 2025
e4ab31e
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
85fa82b
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
0839546
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
c796a7a
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
c0583e0
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
e8888f8
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
3ae426a
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
6cf7ad8
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
3f5b936
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
c145441
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
fdb739e
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
4f64dd9
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
3ba3014
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 25, 2025
94bb3c8
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 26, 2025
c552288
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 26, 2025
4ad8a29
fix paths to versioning config
armcknight Apr 26, 2025
e61760c
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 26, 2025
37b6f13
Merge branch 'armcknight/ci/ios-swift-cleanup' into armcknight/meta/c…
armcknight Apr 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Samples/iOS-Swift/iOS-Benchmarking.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "../Shared/Config/Packaging.xcconfig"
#include "../Shared/Config/SearchPaths.xcconfig"
#include "../Shared/Config/Signing.xcconfig"
#include "../Shared/Config/Versioning.xcconfig"
#include "../Shared/Config/CodeGeneration.xcconfig"
#include "../Shared/Config/ClangLanguage.xcconfig"
#include "../Shared/Config/ClangCppLanguage.xcconfig"
Expand All @@ -21,6 +20,8 @@
#include "../Shared/Config/Swift.xcconfig"
#include "../Shared/Config/Metal.xcconfig"

#include "../../Sources/Configuration/Versioning.xcconfig"

PRODUCT_BUNDLE_IDENTIFIER = io.sentry.iOS-Benchmarking
INFOPLIST_FILE = iOS-Benchmarking/Info.plist

Expand Down
3 changes: 2 additions & 1 deletion Samples/iOS-Swift/iOS-Swift-UITests.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "../Shared/Config/Packaging.xcconfig"
#include "../Shared/Config/SearchPaths.xcconfig"
#include "../Shared/Config/Signing.xcconfig"
#include "../Shared/Config/Versioning.xcconfig"
#include "../Shared/Config/CodeGeneration.xcconfig"
#include "../Shared/Config/ClangLanguage.xcconfig"
#include "../Shared/Config/ClangCppLanguage.xcconfig"
Expand All @@ -21,6 +20,8 @@
#include "../Shared/Config/Swift.xcconfig"
#include "../Shared/Config/Metal.xcconfig"

#include "../../Sources/Configuration/Versioning.xcconfig"

PRODUCT_BUNDLE_IDENTIFIER = io.sentry.iOS-Swift-UITests

PROVISIONING_PROFILE_SPECIFIER_Debug = match Development io.sentry.iOS-Swift-UITests.xctrunner
Expand Down
3 changes: 2 additions & 1 deletion Samples/iOS-Swift/iOS-Swift.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "../Shared/Config/Packaging.xcconfig"
#include "../Shared/Config/SearchPaths.xcconfig"
#include "../Shared/Config/Signing.xcconfig"
#include "../Shared/Config/Versioning.xcconfig"
#include "../Shared/Config/CodeGeneration.xcconfig"
#include "../Shared/Config/ClangLanguage.xcconfig"
#include "../Shared/Config/ClangCppLanguage.xcconfig"
Expand All @@ -21,6 +20,8 @@
#include "../Shared/Config/Swift.xcconfig"
#include "../Shared/Config/Metal.xcconfig"

#include "../../Sources/Configuration/Versioning.xcconfig"

PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.iOS-Swift
INFOPLIST_FILE = iOS-Swift/Info.plist
CODE_SIGN_ENTITLEMENTS = iOS-Swift/iOS-Swift.entitlements
Expand Down
3 changes: 2 additions & 1 deletion Samples/iOS-Swift/iOS-SwiftClip.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "../Shared/Config/Packaging.xcconfig"
#include "../Shared/Config/SearchPaths.xcconfig"
#include "../Shared/Config/Signing.xcconfig"
#include "../Shared/Config/Versioning.xcconfig"
#include "../Shared/Config/CodeGeneration.xcconfig"
#include "../Shared/Config/ClangLanguage.xcconfig"
#include "../Shared/Config/ClangCppLanguage.xcconfig"
Expand All @@ -21,6 +20,8 @@
#include "../Shared/Config/Swift.xcconfig"
#include "../Shared/Config/Metal.xcconfig"

#include "../../Sources/Configuration/Versioning.xcconfig"

PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.iOS-Swift.Clip
INFOPLIST_FILE = iOS-SwiftClip/Info.plist
CODE_SIGN_ENTITLEMENTS = iOS-SwiftClip/iOS_SwiftClip.entitlements
Expand Down
3 changes: 2 additions & 1 deletion Samples/iOS-Swift6/iOS-Swift6-UITests.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "../Shared/Config/Packaging.xcconfig"
#include "../Shared/Config/SearchPaths.xcconfig"
#include "../Shared/Config/Signing.xcconfig"
#include "../Shared/Config/Versioning.xcconfig"
#include "../Shared/Config/CodeGeneration.xcconfig"
#include "../Shared/Config/ClangLanguage.xcconfig"
#include "../Shared/Config/ClangCppLanguage.xcconfig"
Expand All @@ -21,6 +20,8 @@
#include "../Shared/Config/Swift.xcconfig"
#include "../Shared/Config/Metal.xcconfig"

#include "../../Sources/Configuration/Versioning.xcconfig"

PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.iOS-Swift6-UITests

SUPPORTED_PLATFORMS = iphoneos iphonesimulator
Expand Down
3 changes: 2 additions & 1 deletion Samples/iOS-Swift6/iOS-Swift6.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "../Shared/Config/Packaging.xcconfig"
#include "../Shared/Config/SearchPaths.xcconfig"
#include "../Shared/Config/Signing.xcconfig"
#include "../Shared/Config/Versioning.xcconfig"
#include "../Shared/Config/CodeGeneration.xcconfig"
#include "../Shared/Config/ClangLanguage.xcconfig"
#include "../Shared/Config/ClangCppLanguage.xcconfig"
Expand All @@ -21,6 +20,8 @@
#include "../Shared/Config/Swift.xcconfig"
#include "../Shared/Config/Metal.xcconfig"

#include "../../Sources/Configuration/Versioning.xcconfig"

PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.iOS-Swift6
INFOPLIST_FILE = iOS-Swift6/Info.plist
SUPPORTED_PLATFORMS = iphoneos iphonesimulator
Expand Down
3 changes: 2 additions & 1 deletion Samples/iOS13-Swift/iOS13-Swift-UITests.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "../Shared/Config/Packaging.xcconfig"
#include "../Shared/Config/SearchPaths.xcconfig"
#include "../Shared/Config/Signing.xcconfig"
#include "../Shared/Config/Versioning.xcconfig"
#include "../Shared/Config/CodeGeneration.xcconfig"
#include "../Shared/Config/ClangLanguage.xcconfig"
#include "../Shared/Config/ClangCppLanguage.xcconfig"
Expand All @@ -21,6 +20,8 @@
#include "../Shared/Config/Swift.xcconfig"
#include "../Shared/Config/Metal.xcconfig"

#include "../../Sources/Configuration/Versioning.xcconfig"

PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.iOS13-Swift-UITests

SUPPORTED_PLATFORMS = iphoneos iphonesimulator
Expand Down
3 changes: 2 additions & 1 deletion Samples/iOS13-Swift/iOS13-Swift.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "../Shared/Config/Packaging.xcconfig"
#include "../Shared/Config/SearchPaths.xcconfig"
#include "../Shared/Config/Signing.xcconfig"
#include "../Shared/Config/Versioning.xcconfig"
#include "../Shared/Config/CodeGeneration.xcconfig"
#include "../Shared/Config/ClangLanguage.xcconfig"
#include "../Shared/Config/ClangCppLanguage.xcconfig"
Expand All @@ -21,6 +20,8 @@
#include "../Shared/Config/Swift.xcconfig"
#include "../Shared/Config/Metal.xcconfig"

#include "../../Sources/Configuration/Versioning.xcconfig"

PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.iOS13-Swift
INFOPLIST_FILE = iOS-Swift/iOS13-Swift/Info.plist
SUPPORTED_PLATFORMS = iphoneos iphonesimulator
2 changes: 2 additions & 0 deletions Sentry.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1883,6 +1883,7 @@
84A8891B28DBD28900C51DFD /* SentryDevice.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryDevice.mm; sourceTree = "<group>"; };
84A8892028DBD8D600C51DFD /* SentryDeviceTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = SentryDeviceTests.mm; sourceTree = "<group>"; };
84A903702D39F66F00690CE4 /* SentryUserFeedbackFormViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SentryUserFeedbackFormViewModel.swift; sourceTree = "<group>"; };
84AB6AAF2DB2E9BA006D6C83 /* Versioning.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Versioning.xcconfig; sourceTree = "<group>"; };
84AC61D029F7541E009EEF61 /* SentryDispatchSourceWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDispatchSourceWrapper.h; path = include/SentryDispatchSourceWrapper.h; sourceTree = "<group>"; };
84AC61D129F7541E009EEF61 /* SentryDispatchSourceWrapper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryDispatchSourceWrapper.m; sourceTree = "<group>"; };
84AC61D429F75A98009EEF61 /* SentryDispatchFactory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryDispatchFactory.h; path = include/SentryDispatchFactory.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2788,6 +2789,7 @@
isa = PBXGroup;
children = (
D8BD2E27292D1F7300D96C6A /* SDK.xcconfig */,
84AB6AAF2DB2E9BA006D6C83 /* Versioning.xcconfig */,
84EACEDF2C3DCAE2009B8753 /* DeploymentTargets.xcconfig */,
63AA75C51EB8B00100D153DE /* Sentry.xcconfig */,
D8199DCF29376FF40074249E /* SentrySwiftUI.xcconfig */,
Expand Down
3 changes: 1 addition & 2 deletions Sources/Configuration/SDK.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "DeploymentTargets.xcconfig"
#include "Versioning.xcconfig"

SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchos watchsimulator appletvos appletvsimulator xros xrsimulator
TARGETED_DEVICE_FAMILY = 1,2,3,4,7
Expand All @@ -10,8 +11,6 @@ DYLIB_INSTALL_NAME_BASE = @rpath
MACH_O_TYPE = mh_dylib
FRAMEWORK_VERSION = A

CURRENT_PROJECT_VERSION = 8.49.1

ALWAYS_SEARCH_USER_PATHS = NO
CLANG_ENABLE_OBJC_ARC = YES
CLANG_ENABLE_MODULES = YES
Expand Down
3 changes: 2 additions & 1 deletion Sources/Configuration/SentrySwiftUI.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "Versioning.xcconfig"

PRODUCT_NAME = SentrySwiftUI
CURRENT_PROJECT_VERSION = 8.49.1

MACOSX_DEPLOYMENT_TARGET = 10.15
IPHONEOS_DEPLOYMENT_TARGET = 13.0
Expand Down
0 Samples/Shared/Config/Versioning.xcconfig → Sources/Configuration/Versioning.xcconfig
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions Utils/VersionBump/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ let files = [
// Files that only accept the format x.x.x in order to release an app using the framework.
// This will enable publishing apps with SDK beta version.
let restrictFiles = [
"./Samples/iOS-Swift/Sample.xcconfig",
"./Sources/Configuration/SDK.xcconfig",
"./Samples/Config/Versioning.xcconfig",
"./Sources/Configuration/SDK.xcconfig", // T O D O: use a single file here that is included into either other one. or even one single file for everything
"./Sources/Configuration/SentrySwiftUI.xcconfig"
]

let args = CommandLine.arguments

let semver: StaticString = "([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*))?(?:\\+[0-9A-Za-z-]+)?"
let semver: StaticString = "MARKETING_VERSION = ([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*))?(?:\\+[0-9A-Za-z-]+)?"
let regex = Regex(semver)
if regex.firstMatch(in: args[1]) == nil {
exit(errormessage: "version number must fit x.x.x format" )
Expand Down
Loading