Code

Fix Dependency Resolution for Rails 5#22

Code

Closed

freerobby wants to merge 5 commits intomasterwistia/wistia-api:masterfrom rg-fix-dependencieswistia/wistia-api:rg-fix-dependenciesCopy head branch name to clipboard

+37,223-60

Commits

Commits on Sep 1, 2016

• Embed ActiveResource into gem so we can remove its dependency, which is causing problems supporting multiple versions of Rails. Develop against Ruby 1.9.3 to avoid IConv requirement for now.

  freerobby

  committed
  8a2560a

  Copy full SHA for 8a2560a

• Rename ActiveSupport to WistiaActiveSupport and ActiveResource to WistiaActiveResource to avoid any conflicts with versions of those libraries that other gems may load.

  freerobby

  committed
  15f244f

  Copy full SHA for 15f244f

Commits on Sep 2, 2016

• Upgrade to dev ruby 2.3.1, from jeweler to juwelier.

  freerobby

  committed
  5727f65

  Copy full SHA for 5727f65

Commits on Sep 12, 2016

• Rename ActiveSupport objects as needed to avoid Rails 5 conflicts.

  freerobby

  committed
  09d425e

  Copy full SHA for 09d425e

• Rescue from TypeError since it is thrown over an ActiveSupport 2/5 incompatibility on load.

  freerobby

  committed
  867f73e

  Copy full SHA for 867f73e