Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move pushNotificationAppID to BuildSettings #24224

Merged
merged 1 commit into from
Mar 17, 2025
Merged

Conversation

kean
Copy link
Contributor

@kean kean commented Mar 14, 2025

Changes

  • Move the settings
  • Remove the "internal" variants (org.wordpress.internal) as discussed

To test:

Regression Notes

  1. Potential unintended areas of impact

  2. What I did to test those areas of impact (or what existing automated tests I relied on)

  3. What automated tests I added (or what prevented me from doing so)

PR submission checklist:

  • I have completed the Regression Notes.
  • I have considered adding unit tests for my changes.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

Testing checklist:

  • WordPress.com sites and self-hosted Jetpack sites.
  • Portrait and landscape orientations.
  • Light and dark modes.
  • Fonts: Larger, smaller and bold text.
  • High contrast.
  • VoiceOver.
  • Languages with large words or with letters/accents not frequently used in English.
  • Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)
  • iPhone and iPad.
  • Multi-tasking: Split view and Slide over. (iPad)

@kean kean added the General label Mar 14, 2025
@kean kean added this to the 25.9 milestone Mar 14, 2025
@kean kean enabled auto-merge March 14, 2025 21:32
@kean kean requested review from jkmassel and mokagio March 14, 2025 21:41
@wpmobilebot
Copy link
Contributor

WordPress Alpha📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.
App NameWordPress Alpha WordPress Alpha
ConfigurationRelease-Alpha
Build Numberpr24224-b3804b0
Version25.8
Bundle IDorg.wordpress.alpha
Commitb3804b0
App Center BuildWPiOS - One-Offs #11681
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@wpmobilebot
Copy link
Contributor

Jetpack Alpha📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.
App NameJetpack Alpha Jetpack Alpha
ConfigurationRelease-Alpha
Build Numberpr24224-b3804b0
Version25.8
Bundle IDcom.jetpack.alpha
Commitb3804b0
App Center Buildjetpack-installable-builds #10710
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

Copy link
Contributor

@mokagio mokagio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a note to say I verified the build configuration to identifier relationship for all the entries.

Next, I'll checkout locally and have a look at how they resolve, just in case.

Copy link
Contributor

@mokagio mokagio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I run the following test.

Hacked a print for the config and push id:

$ git diff

diff --git a/WordPress/Classes/ViewRelated/Me/App Settings/DebugMenuViewController.swift b/WordPress/Classes/ViewRelated/Me/App Settings/DebugMenuViewController.swift
index 99cbeb3076..103dd255de 100644
--- a/WordPress/Classes/ViewRelated/Me/App Settings/DebugMenuViewController.swift	
+++ b/WordPress/Classes/ViewRelated/Me/App Settings/DebugMenuViewController.swift	
@@ -1,5 +1,6 @@
 import UIKit
 import AutomatticTracks
+import BuildSettingsKit
 import SwiftUI
 import WordPressFlux
 import TipKit
@@ -9,6 +10,16 @@ struct DebugMenuView: View {
 
     fileprivate var navigation: NavigationContext
 
+    private var name: String {
+#if DEBUG
+        "Debug"
+#elseif ALPHA_BUILD
+        "Alpha"
+#else
+        "Release"
+#endif
+    }
+
     var body: some View {
         List {
             Section { main }
@@ -17,6 +28,9 @@ struct DebugMenuView: View {
                 Section(Strings.sectionTipKit) { tipKit }
             }
             Section(Strings.sectionLogging) { logging }
+            Section("Push info") {
+                Text("On \(name) build with PushNotificationAppID: \(BuildSettings.pushNotificationAppID)")
+            }
         }
         .toolbar {
             ToolbarItem(placement: .principal) {
diff --git a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Jetpack.xcscheme b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Jetpack.xcscheme
index 5e3b091eb1..6b60b8d45e 100644
--- a/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Jetpack.xcscheme
+++ b/WordPress/WordPress.xcodeproj/xcshareddata/xcschemes/Jetpack.xcscheme
@@ -59,7 +59,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

However, for some reason I can't explain both Release and Release-Alpha builds crash on my device 🤔

I even let CI build the alpha build, but the result was the same.

I really want to get to the bottom of this, but I already spent some time running around in circles. I'm sure it's something dumb that I'm doing that I'll figure out later after taking a step back. I want to move on with the #24165 work.

Approving to unblock.

@kean kean added this pull request to the merge queue Mar 17, 2025
Merged via the queue into trunk with commit 6d89d79 Mar 17, 2025
27 checks passed
@kean kean deleted the task/move-push-notification-id branch March 17, 2025 02:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants