Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Update homebrew tap for Java #6

Merged
Brantone merged 2 commits into from
Jan 15, 2020
Merged

Update homebrew tap for Java #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
179c614
Update homebrew tap for Java
Jan 15, 2020
28e131d
Updates to CHANGELOG
Jan 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
This file is used to list changes made in each version of the Java cookbook.

## Unreleased
Copy link

@Brantone Brantone Jan 15, 2020

Choose a reason for hiding this comment

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

Apprehensive about removing the Unreleased tag, because it's technically not released in the upstream and this was method by way of denoting that (and I think was a convention a year ago).
Might be worth keeping it or denoting Roblox Release or something

Copy link
Author

@zirkov zirkov Jan 15, 2020

Choose a reason for hiding this comment

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

Oh, didn't realize that
Fixing

Copy link
Author

@zirkov zirkov Jan 15, 2020

Choose a reason for hiding this comment

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

@Brantone Updated

### 4.9002.0 - Roblox internal

- Based on proposed changes from <https://github.com/sous-chefs/java/pull/567/>
- Switch homebrew tap to homebrew/cask-versions
- Make Homebrew Tap name an attribute to allow for other options

### 4.9001.0 - Roblox internal

- Make Homebrew Cask name an attribute to allow for other options (ex: adoptopenjdk)

Expand Down
1 change: 1 addition & 0 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
default['java']['windows']['returns'] = 0
when 'mac_os_x'
default['java']['install_flavor'] = 'homebrew'
default['java']['homebrew']['tap'] = 'homebrew/cask-versions'
Copy link

@Brantone Brantone Jan 15, 2020

Choose a reason for hiding this comment

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

👍

default['java']['homebrew']['cask'] = 'java'
else
default['java']['install_flavor'] = 'openjdk'
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
license 'Apache-2.0'
description 'Recipes and resources for installing Java and managing certificates'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '4.9001.0'
version '4.9002.0'

supports 'debian'
supports 'ubuntu'
Expand Down
2 changes: 1 addition & 1 deletion recipes/homebrew.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
include_recipe 'homebrew::cask'
include_recipe 'java::notify'

homebrew_tap 'caskroom/versions'
homebrew_tap node['java']['homebrew']['tap']
homebrew_cask "#{node['java']['homebrew']['cask']}#{node['java']['jdk_version']}" do
notifies :write, 'log[jdk-version-changed]', :immediately
end