diff --git a/BUILDING.md b/BUILDING.md index c0b6493c..a6f618b8 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1146,7 +1146,7 @@ export GEM_PATH=$shortened_path ##### 1. Bump the version in package.json & CHANGELOG.md for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version here: ```bash -cd ios/App && xcrun agvtool new-version 71 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.4.5;/g" App.xcodeproj/project.pbxproj && cd - +cd ios/App && xcrun agvtool new-version 72 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.4.6;/g" App.xcodeproj/project.pbxproj && cd - # Unfortunately this edits Info.plist directly. #xcrun agvtool new-marketing-version 0.4.5 ``` @@ -1172,10 +1172,11 @@ npm run build:ios:prod - Choose Product -> Archive - This will trigger a build and take time, needing user's "login" keychain password (user's login password), repeatedly. + - Required password entry 26 times. + - It can get stuck on uploading SPI; try canceling and restarting. - If it fails with `building for 'iOS', but linking in dylib (.../.pkgx/zlib.net/v1.3.0/lib/libz.1.3.dylib) built for 'macOS'` then run XCode outside that terminal (ie. not with `npx cap open ios`). - - Required password entry 26 times. - Before distributing, confirm the archive carries production server defaults. Xcode packages whatever web bundle is in `ios/App/App/public`, even one from a `--test` build: @@ -1433,8 +1434,8 @@ The recommended way to build for Android is using the automated build script: ##### 1. Bump the version in package.json, then update these versions & run: ```bash -perl -p -i -e 's/versionCode .*/versionCode 71/g' android/app/build.gradle -perl -p -i -e 's/versionName .*/versionName "1.4.5"/g' android/app/build.gradle +perl -p -i -e 's/versionCode .*/versionCode 72/g' android/app/build.gradle +perl -p -i -e 's/versionName .*/versionName "1.4.6"/g' android/app/build.gradle ``` ##### 2. Build @@ -1455,7 +1456,9 @@ npx cap open android #### Android Build from the console -* Note that this currently fails: `./gradlew build -Dlint.baselines.continue=true` +`cd android` + +* Note that this currently fails: `./gradlew build` To create the `aab` file, `bundle` instead of `build` (but not signed and not usable in Play Store): @@ -1471,9 +1474,7 @@ So, to create a signed `aab` release: ```bash # if you use pkgx: pkgx +openjdk.org /bin/zsh -cd android ./gradlew bundleRelease -Dlint.baselines.continue=true -PfirebaseEnabled -cd - ``` ... and find your `aab` file at app/build/outputs/bundle/release diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bdb7572..76682c30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.4.6] - 2026.09.27 +### Fixed +- Incorrect 'test' server URLs on production. + + ## [1.4.5] - 2026.09.24 ### Added - Full flow for setting up SMS notifications: phone registration and code diff --git a/android/app/build.gradle b/android/app/build.gradle index 4793be4e..3fa73886 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "app.timesafari.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 71 - versionName "1.4.5" + versionCode 72 + versionName "1.4.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index d802072e..073c94ac 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -541,7 +541,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = App/AppDebug.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 71; + CURRENT_PROJECT_VERSION = 72; DEVELOPMENT_TEAM = GM3FS5JQPH; ENABLE_APP_SANDBOX = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -552,7 +552,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4.5; + MARKETING_VERSION = 1.4.6; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = app.timesafari; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -571,7 +571,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = App/App.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 71; + CURRENT_PROJECT_VERSION = 72; DEVELOPMENT_TEAM = GM3FS5JQPH; ENABLE_APP_SANDBOX = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -582,7 +582,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4.5; + MARKETING_VERSION = 1.4.6; PRODUCT_BUNDLE_IDENTIFIER = app.timesafari; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; @@ -600,7 +600,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_ENTITLEMENTS = TimeSafariShareExtension/TimeSafariShareExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 71; + CURRENT_PROJECT_VERSION = 72; DEVELOPMENT_TEAM = GM3FS5JQPH; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -614,7 +614,7 @@ "@executable_path/../../Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.4.5; + MARKETING_VERSION = 1.4.6; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = app.timesafari.TimeSafariShareExtension; @@ -638,7 +638,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_ENTITLEMENTS = TimeSafariShareExtension/TimeSafariShareExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 71; + CURRENT_PROJECT_VERSION = 72; DEVELOPMENT_TEAM = GM3FS5JQPH; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -652,7 +652,7 @@ "@executable_path/../../Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.4.5; + MARKETING_VERSION = 1.4.6; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = app.timesafari.TimeSafariShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/package-lock.json b/package-lock.json index 5e39390b..2c11fe55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "giftopia", - "version": "1.4.6-beta", + "version": "1.4.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "giftopia", - "version": "1.4.6-beta", + "version": "1.4.6", "dependencies": { "@capacitor-community/electron": "^5.0.1", "@capacitor-community/sqlite": "^7.0.3", diff --git a/package.json b/package.json index e1d4df72..88d02fa6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "giftopia", - "version": "1.4.6-beta", + "version": "1.4.6", "description": "Giftopia App", "author": { "name": "Gift Economies Team"