Merge pull request #2 from matestack/2.0.0

2.0.0 Release

Author: jonasjabari

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v2.0.0 Release - 2021-04-12
+
+### Changes
+
+- various internal adjustments matching `matestack-ui-core` 2.0.0 changes
+- changed to MIT license like `matestack-ui-core`
+
+
 ## v1.5.1 Release - 2021-03-07
 
 ### Bugfixes

Dockerfile.dev

@@ -3,7 +3,7 @@ FROM ruby:2.7.2-alpine3.12
 RUN gem install bundler:2.1.4
 
 RUN apk update --no-cache && \
-    apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev npm && \
+    apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev npm shared-mime-info && \
     mkdir -p /app
 
 WORKDIR /app

Dockerfile.release

@@ -3,7 +3,7 @@ FROM ruby:2.7.2-alpine3.12
 RUN gem install bundler:2.1.4
 
 RUN apk update --no-cache && \
-    apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev npm && \
+    apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev npm shared-mime-info && \
     mkdir -p /app
 
 WORKDIR /app

Dockerfile.test

@@ -3,7 +3,7 @@ FROM ruby:2.7.2-alpine3.12
 RUN gem install bundler:2.1.4
 
 RUN apk update --no-cache && \
-    apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev npm && \
+    apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev npm shared-mime-info && \
     mkdir -p /app
 
 WORKDIR /app

Gemfile

@@ -9,9 +9,7 @@ gem 'redcarpet' # for markdown usage
 gem 'rouge' # for syntax highlighting
 
 gem 'bootsnap', require: false
-gem "trailblazer-cells"
-gem "cells-rails"
-gem "cells-haml"
+
 
 # Declare your gem's dependencies in matestack-ui-material.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
@@ -25,6 +23,7 @@ gemspec
 
 gem 'rails', '6.1.2'
 
+
 gem 'rspec-rails', '~> 4.0.2'
 gem 'capybara'
 gem 'webpacker', '~> 5.0'

Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    matestack-ui-bootstrap (1.4.0)
-      matestack-ui-core (~> 1.4.0)
+    matestack-ui-bootstrap (2.0.0)
+      matestack-ui-core (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -69,7 +69,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     bcrypt (3.1.16)
-    bootsnap (1.7.2)
+    bootsnap (1.7.3)
       msgpack (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
@@ -81,26 +81,12 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    cells (4.1.7)
-      declarative-builder (< 0.2.0)
-      declarative-option (< 0.2.0)
-      tilt (>= 1.4, < 3)
-      uber (< 0.2.0)
-    cells-haml (0.0.10)
-      cells (>= 4.0.1, <= 6.0.0)
-      haml (>= 4.1.0.beta.1)
-    cells-rails (0.1.3)
-      actionpack (>= 5.0)
-      cells (>= 4.1.6, < 5.0.0)
     childprocess (3.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.8)
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    declarative-builder (0.1.0)
-      declarative-option (< 0.2.0)
-    declarative-option (0.1.0)
     devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -110,44 +96,39 @@ GEM
     diff-lcs (1.4.4)
     docile (1.3.5)
     erubi (1.10.0)
-    faker (2.16.0)
+    faker (2.17.0)
       i18n (>= 1.6, < 2)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    haml (5.2.1)
-      temple (>= 0.8.0)
-      tilt
     hashdiff (1.0.1)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    matestack-ui-core (1.4.0)
-      cells-haml (>= 0.0.10)
-      cells-rails (>= 0.1.0)
-      haml (>= 4.1.0.beta.1)
+    matestack-ui-core (2.0.0)
       rails (>= 5.2)
-      trailblazer-cells (>= 0.0.3)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
+    mini_mime (1.1.0)
     mini_portile2 (2.5.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     msgpack (1.4.2)
-    nio4r (2.5.5)
-    nokogiri (1.11.1)
+    nio4r (2.5.7)
+    nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    paper_trail (11.1.0)
+    paper_trail (12.0.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
     pg (1.2.3)
@@ -160,7 +141,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    puma (5.2.1)
+    puma (5.2.2)
       nio4r (~> 2.0)
     racc (1.5.2)
     rack (2.2.3)
@@ -197,13 +178,13 @@ GEM
     rake (13.0.3)
     redcarpet (3.5.1)
     redis (4.2.5)
-    regexp_parser (2.0.3)
+    regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rouge (3.26.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -234,7 +215,7 @@ GEM
     selenium-webdriver (3.142.7)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
-    semantic_range (2.3.1)
+    semantic_range (3.0.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -248,17 +229,12 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    temple (0.8.2)
     thor (1.1.0)
-    tilt (2.0.10)
-    trailblazer-cells (0.0.3)
-      cells (>= 4.1.0.rc1, < 5.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    uber (0.1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webmock (3.11.2)
+    webmock (3.12.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -281,8 +257,6 @@ DEPENDENCIES
   bootsnap
   byebug
   capybara
-  cells-haml
-  cells-rails
   devise
   faker
   generator_spec
@@ -301,7 +275,6 @@ DEPENDENCIES
   rspec-wait
   selenium-webdriver
   simplecov
-  trailblazer-cells
   webmock
   webpacker (~> 5.0)
 

LICENSE

@@ -1,8 +1,20 @@
 Copyright (c) Matestack GmbH
 
-matestack-ui-bootstrap is an Open Source project licensed under the terms of
-the LGPLv3 license.  Please see <http://www.gnu.org/licenses/lgpl-3.0.html>
-for license text.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-Matestack will provide a commercial-friendly license allowing private forks
-and modifications of matestack-ui-bootstrap.  Please request at [email protected]
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.