Skip to content

Commit

Permalink
Merge pull request #122 from pascalpp/v2.0.7
Browse files Browse the repository at this point in the history
v2.0.7
  • Loading branch information
pascalpp committed Apr 1, 2024
2 parents 4ac72cf + f6b6edc commit 357bed4
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1 +1,2 @@
xcuserdata
.DS_Store
21 changes: 13 additions & 8 deletions Free Ruler.xcodeproj/project.pbxproj
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -152,8 +152,9 @@
6F41027D2260712F00F06A10 /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1020;
LastUpgradeCheck = 1420;
LastUpgradeCheck = 1530;
ORGANIZATIONNAME = "Free Ruler";
TargetAttributes = {
6F4102842260712F00F06A10 = {
Expand Down Expand Up @@ -283,6 +284,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -348,6 +350,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -372,10 +375,10 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "Free Ruler/Free_Ruler.entitlements";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 285;
CURRENT_PROJECT_VERSION = 294;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = X88CY268NZ;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -385,9 +388,10 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 2.0.6;
MARKETING_VERSION = 2.0.7;
PRODUCT_BUNDLE_IDENTIFIER = com.pascal.freeruler;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
name = Debug;
Expand All @@ -398,10 +402,10 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "Free Ruler/Free_Ruler.entitlements";
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 285;
CURRENT_PROJECT_VERSION = 294;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = X88CY268NZ;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -411,9 +415,10 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 2.0.6;
MARKETING_VERSION = 2.0.7;
PRODUCT_BUNDLE_IDENTIFIER = com.pascal.freeruler;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
name = Release;
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
LastUpgradeVersion = "1530"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1420"
LastUpgradeVersion = "1530"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
10 changes: 7 additions & 3 deletions HOW-TO-RELEASE.md
Expand Up @@ -3,25 +3,29 @@
Mostly notes for myself.

- Merge any PRs to be included in the release.
- Create a new branch from master named vX.X.X
- Create a new branch from main named vX.X.X
- Get the number of commits:

```
git log --pretty=oneline | wc -l
```

- In XCode, bump the version and build number, using the number of commits as the build number. Example https://github.com/pascalpp/FreeRuler/commit/ed9f8db186b00125a78629a5e5569dfda9dd6285
- In Xcode, choose Product > Archive
- In the Archives window, click Validate App. May require visiting https://developer.apple.com to accept updated licensing agreements, etc.

## Github Release
- In the XCode Archives window, click Distribute App > Copy App.

- In the XCode Archives window, click Distribute App > Direct Distribution > Distribute.
- Export the build to the `dist` folder in the repo. Compress just Free Ruler.app as free-ruler-X.X.X.zip. Delete the app and any extra folders created by the build process.
- Commit the modified XCode project and the new zip file with the commit message 'Build vX.X.X'
- Create a PR for the branch back to master.
- Create a PR for the branch back to main.
- Review and merge the PR.
- Draft a new Github release https://github.com/pascalpp/FreeRuler/releases/new. Use v.X.X.X as the title and tag for the release. Describe changes with #XX references to closed tickets. Attach the new zip file to the release.
- Publish.

## App Store Release

- In the XCode Archives window, click Distribute App > App Store Connect > Upload.
- Visit https://appstoreconnect.apple.com and submit the new build for review.
- Create a new version (green plus button).
Expand Down
Binary file added dist/free-ruler-2.0.7.zip
Binary file not shown.

0 comments on commit 357bed4

Please sign in to comment.