Merge dev into loopkit_dev_submodules #36
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Replace $(DEVELOPMENT_TEAM) parsed from BUNDLE_IDENTIFIER in Config.xcconfig with ENV["TEAMID"] - Use BUNDLE_ID instead of hard coded bundle identifier in Fastfile, inspired by Artificial-Pancreas/iAPS 6a46a2a by @Jon-b-m - Allows building of different instances of the app by only editing Config.xcconfig.
Update App Name and Logos
… align with Loop dev improvements, as previously added to iAPS in PR 46
- use actions/checkout@v4 - use aormsby/Fork-Sync-With-Upstream-action@v3.4.1 - comment out "Select Xcode version" step to use the default Xcode (15.0.1) in macos-13 runner based on https://github.com/LoopKit/LoopWorkspace/pull/120/files by @dnzxy
- UPSTREAM_REPO: nightscout/Open-iAPS
- Search for and create `alive` branch by use of `${{ github.repository }}` context, instead of
`${{ github.repository_owner }}/iAPS`
- Create `alive` branch from `main` instead of `dev`
- do not run the upstream sync action on the upstream repository (owner = nightscout)
- update testflight.md with the Open-iAPS name
- Authenticate the curl API request by GH_PAT according to https://docs.github.com/de/rest/authentication/authenticating-to-the-rest-api?apiVersion=2022-11-28#authenticating-in-a-github-actions-workflow-using-curl Thank you @dnzxy for the hint! This is a temporary requirement until the repositories are made public.
Allow config override file to take action from two directories up, to align with Loop and other DIY projects.
Makes the config override file in the project root take precedence if there are override files in both root and two directories up.
Config.xcconfig: #include? "../../ConfigOverride.xcconfig"
Fastlane/GH build improvements: Add sync action and keepalive action,
Get BUNDLE_IDENTIFIER from Config.xcconfig for use in Fastfile
Thanks to @marionbarker for input.
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER).FreeAPSTests" - Update plist keys with Open-iAPS: INFOPLIST_KEY_CFBundleDisplayName = Open-iAPS INFOPLIST_KEY_CFBundleDisplayName = "Open-iAPS WatchKit Extension"
- Config.xconfig: APP_URL_SCHEME = Open-iAPS - remove hardcoded "freeaps-x", leaving $(APP_URL_SCHEME) - CGMType.swift: libreTransmitter: URL(string: "Open-iAPS://libre-transmitter" - AlertEntry.swift: static let manual = "Open-iAPS" - CarbsEntry.swift: static let manual = "Open-iAPS" - NightscoutTreatment.swift: static let local = "Open-iAPS" - Sources/Models/TempTarget.swift: static let manual = "Open-iAPS" - NightscoutAPI.swift: var enteredBy = "Open-iAPS", var notes = "Open-iAPS connected" - GarminManager.swift: connectIQ?.initialize(withUrlScheme: "Open-iAPS", uiOverrideDelegate: self)
Changing the app display name from `OiAPS` (as introduced in #19) to `Open-iAPS`, after having discussed this in Discord.
Update URL scheme for Open-iAPS
Feat: App display name, BundleID and reset of version number to 0.1.0
Merged
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.