fix: resolve install issues with Bundler

by making `bridgetown-foundation` a direct dependency of `bridgetown`, relocating versioning responsibility to foundation gem
bridgetownrb · Aug 18, 2024 · 50147ea · 50147ea
1 parent a84ef9f
commit 50147ea
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 42 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,17 +1,17 @@
 PATH
   remote: bridgetown-builder
   specs:
-    bridgetown-builder (2.0.0.beta1)
-      bridgetown-core (= 2.0.0.beta1)
+    bridgetown-builder (2.0.0.beta2)
+      bridgetown-core (= 2.0.0.beta2)
 
 PATH
   remote: bridgetown-core
   specs:
-    bridgetown-core (2.0.0.beta1)
+    bridgetown-core (2.0.0.beta2)
       activesupport (>= 6.0, < 8.0)
       addressable (~> 2.4)
       amazing_print (~> 1.2)
-      bridgetown-foundation (= 2.0.0.beta1)
+      bridgetown-foundation (= 2.0.0.beta2)
       csv (~> 3.2)
       dry-inflector (>= 1.0)
       erubi (~> 1.9)
@@ -37,24 +37,25 @@ PATH
 PATH
   remote: bridgetown-foundation
   specs:
-    bridgetown-foundation (2.0.0.beta1)
+    bridgetown-foundation (2.0.0.beta2)
       hash_with_dot_access (~> 2.0)
       inclusive (~> 1.0)
       zeitwerk (~> 2.5)
 
 PATH
   remote: bridgetown-paginate
   specs:
-    bridgetown-paginate (2.0.0.beta1)
-      bridgetown-core (= 2.0.0.beta1)
+    bridgetown-paginate (2.0.0.beta2)
+      bridgetown-core (= 2.0.0.beta2)
 
 PATH
   remote: bridgetown
   specs:
-    bridgetown (2.0.0.beta1)
-      bridgetown-builder (= 2.0.0.beta1)
-      bridgetown-core (= 2.0.0.beta1)
-      bridgetown-paginate (= 2.0.0.beta1)
+    bridgetown (2.0.0.beta2)
+      bridgetown-builder (= 2.0.0.beta2)
+      bridgetown-core (= 2.0.0.beta2)
+      bridgetown-foundation (= 2.0.0.beta2)
+      bridgetown-paginate (= 2.0.0.beta2)
 
 GEM
   remote: https://rubygems.org/

diff --git a/bridgetown-builder/bridgetown-builder.gemspec b/bridgetown-builder/bridgetown-builder.gemspec
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../bridgetown-core/lib/bridgetown-core/version"
+require_relative "../bridgetown-foundation/lib/bridgetown/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "bridgetown-builder"

diff --git a/bridgetown-builder/lib/bridgetown-builder.rb b/bridgetown-builder/lib/bridgetown-builder.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "bridgetown-core"
-require "bridgetown-core/version"
 
 module Bridgetown
   module Builders

diff --git a/bridgetown-core/bridgetown-core.gemspec b/bridgetown-core/bridgetown-core.gemspec
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "lib/bridgetown-core/version"
+require_relative "../bridgetown-foundation/lib/bridgetown/version"
 
 Gem::Specification.new do |s|
   s.name          = "bridgetown-core"

diff --git a/bridgetown-foundation/bridgetown-foundation.gemspec b/bridgetown-foundation/bridgetown-foundation.gemspec
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "lib/bridgetown/foundation/version"
+require_relative "lib/bridgetown/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "bridgetown-foundation"
-  spec.version       = Bridgetown::Foundation::VERSION
+  spec.version       = Bridgetown::VERSION
   spec.author        = "Bridgetown Team"
   spec.email         = "[email protected]"
   spec.summary       = "Ruby language extensions and other utilities useful for the Bridgetown ecosystem"

diff --git a/bridgetown-foundation/lib/bridgetown-foundation.rb b/bridgetown-foundation/lib/bridgetown-foundation.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "bridgetown/foundation/version"
+require "bridgetown/version"
 require "hash_with_dot_access"
 require "inclusive"
 require "zeitwerk"

diff --git a/bridgetown-foundation/lib/bridgetown/foundation/version.rb b/bridgetown-foundation/lib/bridgetown/foundation/version.rb
diff --git a/...etown-core/lib/bridgetown-core/version.rb → ...town-foundation/lib/bridgetown/version.rb b/...etown-core/lib/bridgetown-core/version.rb → ...town-foundation/lib/bridgetown/version.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "2.0.0.beta1"
+  VERSION = "2.0.0.beta2"
   CODE_NAME = "(TBD!)"
 end
diff --git a/bridgetown-paginate/bridgetown-paginate.gemspec b/bridgetown-paginate/bridgetown-paginate.gemspec
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../bridgetown-core/lib/bridgetown-core/version"
+require_relative "../bridgetown-foundation/lib/bridgetown/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "bridgetown-paginate"

diff --git a/bridgetown-paginate/lib/bridgetown-paginate.rb b/bridgetown-paginate/lib/bridgetown-paginate.rb
@@ -8,7 +8,6 @@
 #################################################
 
 require "bridgetown-core"
-require "bridgetown-core/version"
 
 module Bridgetown
   module Paginate

diff --git a/bridgetown-routes/bridgetown-routes.gemspec b/bridgetown-routes/bridgetown-routes.gemspec
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../bridgetown-core/lib/bridgetown-core/version"
+require_relative "../bridgetown-foundation/lib/bridgetown/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "bridgetown-routes"

diff --git a/bridgetown-website/Gemfile.lock b/bridgetown-website/Gemfile.lock
@@ -1,17 +1,17 @@
 PATH
   remote: ../bridgetown-builder
   specs:
-    bridgetown-builder (2.0.0.beta1)
-      bridgetown-core (= 2.0.0.beta1)
+    bridgetown-builder (2.0.0.beta2)
+      bridgetown-core (= 2.0.0.beta2)
 
 PATH
   remote: ../bridgetown-core
   specs:
-    bridgetown-core (2.0.0.beta1)
+    bridgetown-core (2.0.0.beta2)
       activesupport (>= 6.0, < 8.0)
       addressable (~> 2.4)
       amazing_print (~> 1.2)
-      bridgetown-foundation (= 2.0.0.beta1)
+      bridgetown-foundation (= 2.0.0.beta2)
       csv (~> 3.2)
       dry-inflector (>= 1.0)
       erubi (~> 1.9)
@@ -37,24 +37,25 @@ PATH
 PATH
   remote: ../bridgetown-foundation
   specs:
-    bridgetown-foundation (2.0.0.beta1)
+    bridgetown-foundation (2.0.0.beta2)
       hash_with_dot_access (~> 2.0)
       inclusive (~> 1.0)
       zeitwerk (~> 2.5)
 
 PATH
   remote: ../bridgetown-paginate
   specs:
-    bridgetown-paginate (2.0.0.beta1)
-      bridgetown-core (= 2.0.0.beta1)
+    bridgetown-paginate (2.0.0.beta2)
+      bridgetown-core (= 2.0.0.beta2)
 
 PATH
   remote: ../bridgetown
   specs:
-    bridgetown (2.0.0.beta1)
-      bridgetown-builder (= 2.0.0.beta1)
-      bridgetown-core (= 2.0.0.beta1)
-      bridgetown-paginate (= 2.0.0.beta1)
+    bridgetown (2.0.0.beta2)
+      bridgetown-builder (= 2.0.0.beta2)
+      bridgetown-core (= 2.0.0.beta2)
+      bridgetown-foundation (= 2.0.0.beta2)
+      bridgetown-paginate (= 2.0.0.beta2)
 
 GEM
   remote: https://rubygems.org/

diff --git a/bridgetown/bridgetown.gemspec b/bridgetown/bridgetown.gemspec
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../bridgetown-core/lib/bridgetown-core/version"
+require_relative "../bridgetown-foundation/lib/bridgetown/version"
 
 Gem::Specification.new do |s|
   s.name          = "bridgetown"
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("bridgetown-builder", Bridgetown::VERSION)
   s.add_dependency("bridgetown-core", Bridgetown::VERSION)
+  s.add_dependency("bridgetown-foundation", Bridgetown::VERSION)
   s.add_dependency("bridgetown-paginate", Bridgetown::VERSION)
   s.metadata["rubygems_mfa_required"] = "true"
 end
diff --git a/bridgetown/lib/bridgetown.rb b/bridgetown/lib/bridgetown.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "bridgetown-core"
-require "bridgetown-core/version"
 
 # Load additional monorepo gems
 require "bridgetown-builder"