diff --git a/BUILDING.md b/BUILDING.md index 1dd322e0b1..7a31eaf762 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1151,28 +1151,28 @@ If you need to build manually or want to understand the individual steps: - ... and you may have to fix these, especially with pkgx: - ```bash - gem_path=$(which gem) - shortened_path="${gem_path:h:h}" - export GEM_HOME=$shortened_path - export GEM_PATH=$shortened_path - ``` +```bash +gem_path=$(which gem) +shortened_path="${gem_path:h:h}" +export GEM_HOME=$shortened_path +export GEM_PATH=$shortened_path +``` ##### 1. Bump the version in package.json for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version; - ```bash - cd ios/App && xcrun agvtool new-version 46 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.1.1;/g" App.xcodeproj/project.pbxproj && cd - - # Unfortunately this edits Info.plist directly. - #xcrun agvtool new-marketing-version 0.4.5 - ``` +```bash +cd ios/App && xcrun agvtool new-version 47 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.1.2;/g" App.xcodeproj/project.pbxproj && cd - +# Unfortunately this edits Info.plist directly. +#xcrun agvtool new-marketing-version 0.4.5 +``` ##### 2. Build - Here's prod. Also available: test, dev +Here's prod. Also available: test, dev - ```bash - npm run build:ios:prod - ``` +```bash +npm run build:ios:prod +``` 3.1. Use Xcode to build and run on simulator or device. @@ -1315,26 +1315,26 @@ The recommended way to build for Android is using the automated build script: #### Android Manual Build Process -##### 1. Bump the version in package.json, then here: android/app/build.gradle +##### 1. Bump the version in package.json, then update these versions & run: - ```bash - perl -p -i -e 's/versionCode .*/versionCode 46/g' android/app/build.gradle - perl -p -i -e 's/versionName .*/versionName "1.1.1"/g' android/app/build.gradle - ``` +```bash +perl -p -i -e 's/versionCode .*/versionCode 47/g' android/app/build.gradle +perl -p -i -e 's/versionName .*/versionName "1.1.2"/g' android/app/build.gradle +``` ##### 2. Build Here's prod. Also available: test, dev - ```bash - npm run build:android:prod - ``` +```bash +npm run build:android:prod +``` ##### 3. Open the project in Android Studio - ```bash - npx cap open android - ``` +```bash +npx cap open android +``` ##### 4. Use Android Studio to build and run on emulator or device diff --git a/CHANGELOG.md b/CHANGELOG.md index ff6bd9b842..b59c254c3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ 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.1.2] - 2025.11.06 + +### Fixed +- Bad page when user follows prompt to backup seed + + ## [1.1.1] - 2025.11.03 ### Added diff --git a/android/app/build.gradle b/android/app/build.gradle index d37bbd9846..edd4acd186 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -31,8 +31,8 @@ android { applicationId "app.timesafari.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 46 - versionName "1.1.1" + versionCode 47 + versionName "1.1.2" 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 c68a3087b0..fa09b22c8c 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -403,7 +403,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 46; + CURRENT_PROJECT_VERSION = 47; DEVELOPMENT_TEAM = GM3FS5JQPH; ENABLE_APP_SANDBOX = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -413,7 +413,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.1; + MARKETING_VERSION = 1.1.2; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = app.timesafari; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -430,7 +430,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 46; + CURRENT_PROJECT_VERSION = 47; DEVELOPMENT_TEAM = GM3FS5JQPH; ENABLE_APP_SANDBOX = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -440,7 +440,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.1; + MARKETING_VERSION = 1.1.2; PRODUCT_BUNDLE_IDENTIFIER = app.timesafari; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; diff --git a/package-lock.json b/package-lock.json index 106e3223f3..2e78751692 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "timesafari", - "version": "1.1.2-beta", + "version": "1.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "timesafari", - "version": "1.1.2-beta", + "version": "1.1.2", "dependencies": { "@capacitor-community/electron": "^5.0.1", "@capacitor-community/sqlite": "6.0.2", diff --git a/package.json b/package.json index f4ef21361f..17d61ce297 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "timesafari", - "version": "1.1.2-beta", + "version": "1.1.2", "description": "Time Safari Application", "author": { "name": "Time Safari Team"