Fixes geerlingguy#116: Switch from roles and dock tasks to geerlingguy.mac collection.

Author: geerlingguy

README.md

@@ -4,16 +4,7 @@
 
 [![CI][badge-gh-actions]][link-gh-actions]
 
-This playbook installs and configures most of the software I use on my Mac for web and software development. Some things in macOS are slightly difficult to automate, so I still have some manual installation steps, but at least it's all documented here.
-
-This is a work in progress, and is mostly a means for me to document my current Mac's setup. I'll be evolving this playbook over time.
-
-*See also*:
-
-  - [Boxen](https://github.com/boxen)
-  - [Battleschool](http://spencer.gibb.us/blog/2014/02/03/introducing-battleschool)
-  - [osxc](https://github.com/osxc)
-  - [MWGriffin/ansible-playbooks](https://github.com/MWGriffin/ansible-playbooks) (the original inspiration for this project)
+This playbook installs and configures most of the software I use on my Mac for web and software development. Some things in macOS are slightly difficult to automate, so I still have a few manual installation steps, but at least it's all documented here.
 
 ## Installation
 

main.yml

@@ -12,14 +12,18 @@
       tags: ['always']
 
   roles:
-    - role: geerlingguy.homebrew
+    - role: elliotweiser.osx-command-line-tools
+    - role: geerlingguy.mac.homebrew
       tags: ['homebrew']
     - role: geerlingguy.dotfiles
       when: configure_dotfiles
       tags: ['dotfiles']
-    - role: geerlingguy.mas
+    - role: geerlingguy.mac.mas
       when: mas_installed_apps or mas_installed_app_ids
       tags: ['mas']
+    - role: geerlingguy.mac.dock
+      when: configure_dock
+      tags: ['dock']
 
   tasks:
     - import_tasks: tasks/ansible-setup.yml
@@ -40,10 +44,6 @@
     - import_tasks: tasks/extra-packages.yml
       tags: ['extra-packages']
 
-    - import_tasks: tasks/dock.yml
-      when: configure_dock
-      tags: ['dock']
-
     - import_tasks: tasks/sublime-text.yml
       when: configure_sublime
       tags: ['sublime-text']

requirements.yml

@@ -1,5 +1,7 @@
 ---
 roles:
+  - name: elliotweiser.osx-command-line-tools
   - name: geerlingguy.dotfiles
-  - name: geerlingguy.homebrew
-  - name: geerlingguy.mas
+
+collections:
+  - name: geerlingguy.mac