Add macos support #184 #217

phimage · 2019-11-10T18:21:49Z

The commit allow to compile with SwiftPM and if necessary I can make a PR just for this one

The second one add models dumped from apple web site

There is some double when using "identifier" so I put the PR as WIP
I do not know what to do. Merge into one. Find a way to make some alias with template generations

My very dirty dump script is available here https://github.com/phimage/MacModelDump

devicekit-danger-bot · 2019-11-10T18:25:19Z

	4 Warnings
⚠️	Big PR, consider splitting into smaller
⚠️	Plist changed, don’t forget to localize your plist values
⚠️	Source/Device.generated.swift#L995 - Prefer non-optional booleans over optional booleans.
⚠️	Source/Device.generated.swift#L1734 - Prefer empty collection over optional collection.

SwiftLint found issues

Warnings

File	Line	Reason
Device.generated.swift	995	Prefer non-optional booleans over optional booleans.
Device.generated.swift	1734	Prefer empty collection over optional collection.

Generated by 🚫 Danger

Implement some basic method on current device (system name and version, model name)

phimage · 2019-11-11T06:56:53Z

manually removed the double and old mac devices
wip: removed

Zandor300 · 2019-11-11T10:54:04Z

Source/Device.generated.swift

+    /// Device is an [iMac Pro](https://support.apple.com/kb/SP771)
+    ///
+    /// ![Image](https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP771/SP771-imac-pro-2017.png)
+    case iMacPro


I suggest changing this to iMaxPro2017 to prevent having to introduce a breaking change at a later date.

Zandor300 · 2019-11-11T10:56:35Z

Next to the little thing a very nice addition!

phimage · 2019-11-12T09:50:46Z

Thanks for the review. I updated manually the iMacPro name

I make different output formats
https://github.com/phimage/MacModelDump
To output for DeviceKit launch macmodeldump devicekit

Zandor300 · 2019-11-12T10:55:55Z

Source/Device.generated.swift

@@ -286,6 +288,239 @@ public enum Device {
    ///
    /// ![Image](https://support.apple.com/library/APPLE/APPLECARE_ALLGEOS/SP808/sp808-apple-watch-series-5_2x.png)
    case appleWatchSeries5_44mm
+  #elseif os(macOS)


Are you sure os(macOS) is true when running on a Catalyst target?

If not, we can use:

#elseif os(macOS) || targetEnvironment(macCatalyst)

to support both Catalyst and native macOS apps.

os(macOS) return false on Catalyst. os(iOS)return true.
catalyst is an iOS device so the code compiled will be the one create before with #if os(iOS)

I make this PR to see if catalyst must be managed well by DeviceKit, and cut my work into two features. First macOS , then macCatalyst

Okay that fine then.

phimage · 2019-11-14T09:33:56Z

New macbook pro 16 inch 2019

https://support.apple.com/kb/SP809 https://www.apple.com/macbook-pro-16/
https://www.youtube.com/watch?v=ysRigNyavF4

but no model identifier yet! https://support.apple.com/en-us/HT201300

Zandor300 · 2019-11-27T11:30:04Z

Source/Device.swift.gyb

@@ -331,6 +672,8 @@ public enum Device {
      case .simulator(let model): return model.diagonal
      case .unknown: return -1
      }
+    #elseif os(macOS)
+    return -1


Suggested change

return -1

return -1

I will do it to be compliant with the switch, but I think there is some issues with formatting
because now #if #elseif do not shift the code anymore

formatting done ✅

Zandor300 · 2019-11-27T11:33:39Z

Source/Device.swift.gyb

+            "macMini2018",
+            "Device is a [Mac mini (2018)](https://support.apple.com/kb/SP782)",
+            "https://support.apple.com/library/content/dam/edam/applecare/images/en_US/macmini/mac-mini-2018-space-gray.jpg",
+            ["Macmini8,1"], 0,(), "Mac mini (2018)", -1, False, False, False, False, False, False, False, False, False, 0, False, 0),


Suggested change

["Macmini8,1"], 0,(), "Mac mini (2018)", -1, False, False, False, False, False, False, False, False, False, 0, False, 0),

["Macmini8,1"], 0, (), "Mac mini (2018)", -1, False, False, False, False, False, False, False, False, False, 0, False, 0),

Applies to all other devices as well...

add missing space in template done ✅

Zandor300 · 2019-11-27T11:38:13Z

@phimage Sorry for late reply and inactivity. I found some formatting inconsistencies. Please fix those.

~~Also, the device identifier is available now: MacBookPro16,1~~ Edit: I see you already added that.

Add missing space before `return -1`

phimage · 2020-01-01T16:12:30Z

    case macPro2019

Mac Pro (2019)

With also some missing macPro that apple add to the its support page

Kylmakalle · 2021-11-21T23:37:46Z

Hey, any updates on this? Looks pretty useful.

Kylmakalle · 2021-11-26T22:43:51Z

@phimage @Zandor300 anything that blocks merge? 😄

skeletom · 2022-01-06T09:15:30Z

Hello, it is a really useful PR do you plan to merge it soon? Thank you!

pfandrade · 2022-05-20T16:28:34Z

Would also love to see this merged.

vincentleclerc · 2022-11-17T19:05:17Z

Why wasn't this merged...? No more discussion on it, and this is just stagnant.. very important feature for DeviceKit imo.

AvdLee · 2022-12-04T20:27:52Z

@Zandor300 would love to see this getting merged as well! 🙏

phimage · 2022-12-05T12:32:02Z

Hi, my Pull Request is very old, a lot of change happens on DeviceKit (see conflicts and new features)
and I do not use it anymore (so I will no work on it)

If someone want macOS I think, first is to make a new Pull Request (and maybe be inspired by this one)

Zandor300 · 2022-12-15T22:22:25Z

I do want to take a look at this still at some point, just need to find the time...

codecov-commenter · 2022-12-15T22:24:02Z

Codecov Report

Merging #217 (ecdfbb1) into master (f19f9f8) will not change coverage.
The diff coverage is n/a.

@@      Coverage Diff      @@
##   master   #217   +/-   ##
=============================
=============================

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

phimage added 2 commits November 10, 2019 08:43

Allow to compile on macOS

eea7575

Fill mac models and create allXXX array of models

db5e14e

phimage mentioned this pull request Nov 10, 2019

Add utility script to generate swift file on template change #218

Open

Remove old devices: too much indeterminate case

42a9259

Implement some basic method on current device (system name and version, model name)

phimage changed the title ~~WIP: Add macos support #184~~ Add macos support #184 Nov 11, 2019

Zandor300 requested changes Nov 11, 2019

View reviewed changes

Rename iMacPro to iMacPro2017

15fa25b

phimage mentioned this pull request Nov 12, 2019

identify app running under macOS 13 Catalyst #214

Open

Zandor300 reviewed Nov 12, 2019

View reviewed changes

phimage and others added 2 commits November 16, 2019 16:05

Add MacBook Pro (16-inch, 2019)

ddbcea2

Fix some wrong mac device image urls

1b9b4bc

Zandor300 reviewed Nov 27, 2019

View reviewed changes

e-marchand and others added 2 commits November 27, 2019 13:53

Add missing space in macOS device definition in template

f8d4e63

Add missing space before `return -1`

Add new mac pro 2019

ecdfbb1

ytyubox added a commit to ytyubox/DeviceKit that referenced this pull request Mar 25, 2021

Add macOS from devicekit#217

72610ae

ytyubox added a commit to ytyubox/DeviceKit that referenced this pull request Jul 16, 2021

Add macOS from devicekit#217

810ceb5

AvdLee mentioned this pull request Sep 20, 2021

Add macOS support #296

Closed

kidomangp approved these changes Sep 30, 2021

View reviewed changes

phimage closed this Dec 5, 2022

Zandor300 reopened this Dec 15, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add macos support #184 #217

Add macos support #184 #217

phimage commented Nov 10, 2019 •

edited

devicekit-danger-bot commented Nov 10, 2019 •

edited

phimage commented Nov 11, 2019 •

edited

Zandor300 Nov 11, 2019

phimage Nov 27, 2019

Zandor300 commented Nov 11, 2019

phimage commented Nov 12, 2019 •

edited

Zandor300 Nov 12, 2019

phimage Nov 12, 2019

Zandor300 Nov 27, 2019

phimage commented Nov 14, 2019

Zandor300 Nov 27, 2019

phimage Nov 27, 2019

phimage Nov 27, 2019

Zandor300 Nov 27, 2019

phimage Nov 27, 2019 •

edited

Zandor300 commented Nov 27, 2019 •

edited

phimage commented Jan 1, 2020

Kylmakalle commented Nov 21, 2021

Kylmakalle commented Nov 26, 2021

skeletom commented Jan 6, 2022

pfandrade commented May 20, 2022

vincentleclerc commented Nov 17, 2022

AvdLee commented Dec 4, 2022

phimage commented Dec 5, 2022 •

edited

Zandor300 commented Dec 15, 2022

codecov-commenter commented Dec 15, 2022

	["Macmini8,1"], 0,(), "Mac mini (2018)", -1, False, False, False, False, False, False, False, False, False, 0, False, 0),
	["Macmini8,1"], 0, (), "Mac mini (2018)", -1, False, False, False, False, False, False, False, False, False, 0, False, 0),

Add macos support #184 #217

Are you sure you want to change the base?

Add macos support #184 #217

Conversation

phimage commented Nov 10, 2019 • edited

devicekit-danger-bot commented Nov 10, 2019 • edited

SwiftLint found issues

Warnings

phimage commented Nov 11, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Zandor300 commented Nov 11, 2019

phimage commented Nov 12, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

phimage commented Nov 14, 2019

New macbook pro 16 inch 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

phimage Nov 27, 2019 • edited

Choose a reason for hiding this comment

Zandor300 commented Nov 27, 2019 • edited

phimage commented Jan 1, 2020

Kylmakalle commented Nov 21, 2021

Kylmakalle commented Nov 26, 2021

skeletom commented Jan 6, 2022

pfandrade commented May 20, 2022

vincentleclerc commented Nov 17, 2022

AvdLee commented Dec 4, 2022

phimage commented Dec 5, 2022 • edited

Zandor300 commented Dec 15, 2022

codecov-commenter commented Dec 15, 2022

Codecov Report

phimage commented Nov 10, 2019 •

edited

devicekit-danger-bot commented Nov 10, 2019 •

edited

phimage commented Nov 11, 2019 •

edited

phimage commented Nov 12, 2019 •

edited

phimage Nov 27, 2019 •

edited

Zandor300 commented Nov 27, 2019 •

edited

phimage commented Dec 5, 2022 •

edited