Skip to content
This repository was archived by the owner on Apr 21, 2025. It is now read-only.

Conversation

@jmagman
Copy link
Member

@jmagman jmagman commented Dec 2, 2021

In older Xcode bundles the SDK productName is Mac OS X, not macOS. Instead of parsing productName, parse platform, but filter out DriverKit. Regressed in #528.

Needs to handle these:

  {
    "canonicalName" : "driverkit.macosx19.0",
    "displayName" : "DriverKit 19.0",
    "isBaseSdk" : true,
    "platform" : "macosx",
    "platformPath" : "/Users/m/xcode-cipd/Xcode-12A7209.app/Contents/Developer/Platforms/MacOSX.platform",
    "platformVersion" : "10.15.6",
    "sdkPath" : "/Users/m/xcode-cipd/Xcode-12A7209.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/DriverKit19.0.sdk",
    "sdkVersion" : "19.0"
  },
  {
    "canonicalName" : "macosx11.1",
    "displayName" : "macOS 11.1",
    "iOSSupportVersion" : "14.3",
    "isBaseSdk" : true,
    "platform" : "macosx",
    "platformPath" : "/Users/m/xcode-cipd/Xcode-12A7209.app/Contents/Developer/Platforms/MacOSX.platform",
    "platformVersion" : "10.15.6",
    "productBuildVersion" : "20C63",
    "productCopyright" : "1983-2020 Apple Inc.",
    "productName" : "macOS",
    "productUserVisibleVersion" : "11.1",
    "productVersion" : "11.1",
    "sdkPath" : "/Users/m/xcode-cipd/Xcode-12A7209.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk",
    "sdkVersion" : "11.1"
  },
  {
    "canonicalName" : "macosx10.15",
    "displayName" : "macOS 10.15",
    "iOSSupportVersion" : "13.6",
    "isBaseSdk" : true,
    "platform" : "macosx",
    "platformPath" : "/opt/s/w/ir/cache/osx_sdk/XCode.app/Contents/Developer/Platforms/MacOSX.platform",
    "platformVersion" : "10.15.6",
    "productBuildVersion" : "19G68",
    "productCopyright" : "1983-2020 Apple Inc.",
    "productName" : "Mac OS X",
    "productUserVisibleVersion" : "10.15.6",
    "productVersion" : "10.15.6",
    "sdkPath" : "/opt/s/w/ir/cache/osx_sdk/XCode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk",
    "sdkVersion" : "10.15.6"
  },

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read the Flutter Style Guide recently, and have followed its advice.
  • I signed the CLA.
  • I listed at least one issue that this PR fixes in the description above.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or this PR is test-exempt.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@jmagman jmagman self-assigned this Dec 2, 2021
@jmagman jmagman merged commit 36609df into flutter:master Dec 2, 2021
@jmagman jmagman deleted the macos-sdk branch December 2, 2021 18:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants