diff --git a/BUILDING.md b/BUILDING.md index ddc6e6d2..a77228d8 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -321,11 +321,11 @@ Prerequisites: macOS with Xcode installed #### Each Release -0. First time (or if XCode dependencies change): +0. First time (or if dependencies change): - `pkgx +rubygems.org sh` - - ... and you may have to fix these, especially with pkgx + - ... and you may have to fix these, especially with pkgx: ```bash gem_path=$(which gem) @@ -334,12 +334,9 @@ Prerequisites: macOS with Xcode installed export GEM_PATH=$shortened_path ``` - ```bash - cd ios/App - pod install - ``` +1. Check the iOS flag isIOS in CapacitorPlatformService (currently hard-coded for iOS build). -1. Build the web assets: +2. Build the web assets: ```bash rm -rf dist @@ -347,8 +344,15 @@ Prerequisites: macOS with Xcode installed npm run build:capacitor ``` +2. In case dependencies change: + + ```bash + cd ios/App + pod install + cd - + ``` -2. Update iOS project with latest build: +3. Update iOS project with latest build: ```bash npx cap sync ios @@ -356,7 +360,7 @@ Prerequisites: macOS with Xcode installed - If that fails with "Could not find..." then look at the "gem_path" instructions above. -3. Copy the assets: +4. Copy the assets: ```bash # It makes no sense why capacitor-assets will not run without these but it actually changes the contents. @@ -367,15 +371,14 @@ Prerequisites: macOS with Xcode installed npx capacitor-assets generate --ios ``` -4. Bump the version to match Android: +4. Bump the version to match Android & package.json: ``` cd ios/App - xcrun agvtool new-version 25 + xcrun agvtool new-version 29 # Unfortunately this edits Info.plist directly. #xcrun agvtool new-marketing-version 0.4.5 - cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.5.1;/g" > temp - mv temp App.xcodeproj/project.pbxproj + cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.5.3;/g" > temp && mv temp App.xcodeproj/project.pbxproj cd - ``` @@ -403,6 +406,8 @@ Prerequisites: macOS with Xcode installed * You'll probably have to "Manage" something about encryption, disallowed in France. * Then "Save" and "Add to Review" and "Resubmit to App Review". +8. Revert the iOS flag isIOS in CapacitorPlatformService. + ### Android Build Prerequisites: Android Studio with Java SDK installed @@ -427,7 +432,7 @@ Prerequisites: Android Studio with Java SDK installed npx capacitor-assets generate --android ``` -4. Bump version to match iOS: android/app/build.gradle +4. Bump version to match iOS & package.json: android/app/build.gradle 5. Open the project in Android Studio: diff --git a/android/app/build.gradle b/android/app/build.gradle index f105fb52..7a1f3671 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 26 - versionName "0.5.1" + versionCode 29 + versionName "0.5.3" 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 17665bc7..85579124 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 = 26; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = GM3FS5JQPH; ENABLE_APP_SANDBOX = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -413,7 +413,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.5.1; + MARKETING_VERSION = 0.5.3; 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 = 26; + CURRENT_PROJECT_VERSION = 29; DEVELOPMENT_TEAM = GM3FS5JQPH; ENABLE_APP_SANDBOX = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO; @@ -440,7 +440,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 0.5.1; + MARKETING_VERSION = 0.5.3; PRODUCT_BUNDLE_IDENTIFIER = app.timesafari; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; diff --git a/package-lock.json b/package-lock.json index 32c3ce63..42a31fd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "timesafari", - "version": "0.4.8", + "version": "0.5.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "timesafari", - "version": "0.4.8", + "version": "0.5.3", "dependencies": { "@capacitor-community/sqlite": "6.0.2", "@capacitor-mlkit/barcode-scanning": "^6.0.0", diff --git a/package.json b/package.json index 19895a0d..6f694aa2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "timesafari", - "version": "0.5.1", + "version": "0.5.3", "description": "Time Safari Application", "author": { "name": "Time Safari Team" diff --git a/src/views/DiscoverView.vue b/src/views/DiscoverView.vue index 3c63a57b..7f6b303e 100644 --- a/src/views/DiscoverView.vue +++ b/src/views/DiscoverView.vue @@ -788,7 +788,7 @@ export default class DiscoverView extends Vue { const route = { path: this.isProjectsActive ? "/project/" + encodeURIComponent(id) - : "/userProfile/" + encodeURIComponent(id), + : "/user-profile/" + encodeURIComponent(id), }; this.$router.push(route); }