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

fix: define separate module names for UIKitless configurations #4140

Merged
merged 27 commits into from
Jul 9, 2024

Commits on Jul 1, 2024

  1. Configuration menu
    Copy the full SHA
    6c1b08f View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. fix test targets

    armcknight committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    5d77c11 View commit details
    Browse the repository at this point in the history
  2. changelog

    armcknight committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    8f510f3 View commit details
    Browse the repository at this point in the history
  3. changelog

    armcknight committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    d509ee6 View commit details
    Browse the repository at this point in the history
  4. more changes per UIKit build

    - also configure product name and bundle ID
    - rename Debug_without_UIKit and Release_without_UIKit to remove the underscores and capitalize "without"
    - add a separate modulemap file for SentryWithoutUIKit
    armcknight committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    e58a5f5 View commit details
    Browse the repository at this point in the history
  5. rename _SentryPrivate to _SentryWithoutUIKitPrivate in module.modulemap

    fixes this error:
    Module 'SentryWithoutUIKit' in AST file '/Users/andrewmcknight/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/22JF8W0XJRMRE/SentryWithoutUIKit-1Z1Q6V1DCHSHF.pcm' (imported by AST file '/Users/andrewmcknight/Library/Developer/Xcode/DerivedData/ModuleCache.noindex/22JF8W0XJRMRE/_SentryPrivate-23Z4ZY3NE0LI4.pcm') is not defined in any loaded module map file; maybe you need to load '/Users/andrewmcknight/Library/Developer/Xcode/DerivedData/Sentry-gnnqqmcfqpqmmhcjxfzwadgjajnt/Build/Products/DebugWithoutUIKit-iphonesimulator/Sentry.framework/Modules/module.modulemap'?
    
    we probably need to rename this from module.modulemap to
        SentryWithoutUIKitPrivate.modulemap and create the parallel
        SentryPrivate.modulemap and set those as MODULEMAP_PRIVATE_FILE
        per config
    armcknight committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    4cd970d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9128272 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e133b18 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d63a893 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    1b2a7ca View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    623274d View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    0bcec49 View commit details
    Browse the repository at this point in the history
  12. fix linkage test args

    armcknight committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    c2da7e3 View commit details
    Browse the repository at this point in the history
  13. make uikit linkage more strict, because now we have a match for UIKit…

    ….framework in @rpath/SentryWithoutUIKit.framework/SentryWithoutUIKit
    armcknight committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    0cb91fb View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    392e62a View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    f93f597 View commit details
    Browse the repository at this point in the history
  16. typo

    armcknight committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    d6cb350 View commit details
    Browse the repository at this point in the history
  17. try using an include test to fix a downstream issue with my bazel build

    the error starts out as such:
    
    ERROR: /Users/andrewmcknight/Code/organization/getsentry/repos/public/sentry-cocoa-bazel/file_provider_extension/BUILD:4:14: Compiling Swift module //file_provider_extension:file_provider_swift_sources failed: (Exit 1): worker failed: error executing SwiftCompile command (from target //file_provider_extension:file_provider_swift_sources) bazel-out/darwin_arm64-opt-exec-ST-13d3ddad9198/bin/external/build_bazel_rules_swift/tools/worker/worker swiftc ... (remaining 1 argument skipped)
    error: emit-module command failed with exit code 1 (use -v to see invocation)
    <module-includes>:2:9: note: in file included from <module-includes>:2:
            ^
    vendor/Carthage/Build/SentryWithoutUIKit.xcframework/ios-arm64_x86_64-simulator/SentryWithoutUIKit.framework/Headers/SentryWithoutUIKit-Swift.h:324:29: error: cannot find protocol declaration for 'SentrySerializable'
    @protocol SentryRRWebEvent <SentrySerializable>
                                ^
    <module-includes>:2:9: note: in file included from <module-includes>:2:
            ^
    vendor/Carthage/Build/SentryWithoutUIKit.xcframework/ios-arm64_x86_64-simulator/SentryWithoutUIKit.framework/Headers/SentryWithoutUIKit-Swift.h:640:32: error: cannot find interface declaration for 'SentryEvent', superclass of 'SentryReplayEvent'
    @interface SentryReplayEvent : SentryEvent
                                   ^
    <module-includes>:1:9: note: in file included from <module-includes>:1:
            ^
    /private/var/tmp/_bazel_andrewmcknight/1473e8b1ae382f4a9a68831aec4e0587/execroot/_main/vendor/Carthage/Build/SentryWithoutUIKit.xcframework/ios-arm64_x86_64-simulator/SentryWithoutUIKit.framework/Headers/SentryWithoutUIKit.h:50:1: warning: umbrella header for module 'SentryWithoutUIKit' does not include header 'SentryMeasurementUnit.h'
    
    ^
    <module-includes>:1:9: note: in file included from <module-includes>:1:
            ^
    /private/var/tmp/_bazel_andrewmcknight/1473e8b1ae382f4a9a68831aec4e0587/execroot/_main/vendor/Carthage/Build/SentryWithoutUIKit.xcframework/ios-arm64_x86_64-simulator/SentryWithoutUIKit.framework/Headers/SentryWithoutUIKit.h:50:1: warning: umbrella header for module 'SentryWithoutUIKit' does not include header 'SentryNSError.h'
    armcknight committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    15aeae1 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Configuration menu
    Copy the full SHA
    72f2ae5 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. also use the check for available header instead of user defined setti…

    …ng in Swift.h umbrella header
    armcknight committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    d15d002 View commit details
    Browse the repository at this point in the history
  2. fixup! also use the check for available header instead of user define…

    …d setting in Swift.h umbrella header
    armcknight committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    526adf5 View commit details
    Browse the repository at this point in the history
  3. fixup! fixup! also use the check for available header instead of user…

    … defined setting in Swift.h umbrella header
    armcknight committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    ea61def View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Configuration menu
    Copy the full SHA
    8728da2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f772a63 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a6f125f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a25a487 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9ad35df View commit details
    Browse the repository at this point in the history