From a199caaac0ae372ba4ea334e09f025d7e5a72f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Adamowicz?= Date: Sat, 20 Jan 2024 01:34:23 +0100 Subject: [PATCH] update proposals_extended --- Gemfile | 2 +- Gemfile.lock | 8 ++++++++ .../config/decidim_proposals_extended_manifest.js | 2 -- .../images/decidim/proposals_extended/.keep | 0 .../decidim/proposals_extended/application.js | 15 --------------- .../decidim/proposals_extended/application.css | 15 --------------- .../decidim-proposals_extended.gemspec | 4 +--- .../lib/decidim/proposals_extended/version.rb | 2 +- 8 files changed, 11 insertions(+), 37 deletions(-) delete mode 100644 decidim-proposals_extended/app/assets/config/decidim_proposals_extended_manifest.js delete mode 100644 decidim-proposals_extended/app/assets/images/decidim/proposals_extended/.keep delete mode 100644 decidim-proposals_extended/app/assets/javascripts/decidim/proposals_extended/application.js delete mode 100644 decidim-proposals_extended/app/assets/stylesheets/decidim/proposals_extended/application.css diff --git a/Gemfile b/Gemfile index 2274097..6456e55 100644 --- a/Gemfile +++ b/Gemfile @@ -54,5 +54,5 @@ gem 'decidim-processes-extended', path: 'decidim-processes-extended' gem 'decidim-assemblies-extended', path: 'decidim-assemblies-extended' gem 'decidim-meetings_extended', path: 'decidim-module-meetings_extended' gem 'decidim-pages_extended', path: 'decidim-pages_extended' -# gem 'decidim-proposals_extended', path: 'decidim-proposals_extended' +gem 'decidim-proposals_extended', path: 'decidim-proposals_extended' # gem 'decidim-surveys_extended', path: 'decidim-surveys_extended' diff --git a/Gemfile.lock b/Gemfile.lock index 7ab8be8..9924c68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,6 +46,13 @@ PATH decidim-core (= 0.25.2) rails (~> 6.0) +PATH + remote: decidim-proposals_extended + specs: + decidim-proposals_extended (0.1.0) + decidim-core (= 0.25.2) + rails (~> 6.0) + GEM remote: https://rubygems.org/ specs: @@ -870,6 +877,7 @@ DEPENDENCIES decidim-meetings_extended! decidim-pages_extended! decidim-processes-extended! + decidim-proposals_extended! dotenv-rails faker (~> 2.14) fog-aws diff --git a/decidim-proposals_extended/app/assets/config/decidim_proposals_extended_manifest.js b/decidim-proposals_extended/app/assets/config/decidim_proposals_extended_manifest.js deleted file mode 100644 index bf22e77..0000000 --- a/decidim-proposals_extended/app/assets/config/decidim_proposals_extended_manifest.js +++ /dev/null @@ -1,2 +0,0 @@ -//= link_directory ../javascripts/decidim/proposals_extended .js -//= link_directory ../stylesheets/decidim/proposals_extended .css diff --git a/decidim-proposals_extended/app/assets/images/decidim/proposals_extended/.keep b/decidim-proposals_extended/app/assets/images/decidim/proposals_extended/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/decidim-proposals_extended/app/assets/javascripts/decidim/proposals_extended/application.js b/decidim-proposals_extended/app/assets/javascripts/decidim/proposals_extended/application.js deleted file mode 100644 index 67ce467..0000000 --- a/decidim-proposals_extended/app/assets/javascripts/decidim/proposals_extended/application.js +++ /dev/null @@ -1,15 +0,0 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// compiled file. JavaScript code in this file should be added after the last require_* statement. -// -// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details -// about supported directives. -// -//= require rails-ujs -//= require activestorage -//= require_tree . diff --git a/decidim-proposals_extended/app/assets/stylesheets/decidim/proposals_extended/application.css b/decidim-proposals_extended/app/assets/stylesheets/decidim/proposals_extended/application.css deleted file mode 100644 index 0ebd7fe..0000000 --- a/decidim-proposals_extended/app/assets/stylesheets/decidim/proposals_extended/application.css +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS - * files in this directory. Styles in this file should be added after the last require_* statement. - * It is generally better to create a new file per style scope. - * - *= require_tree . - *= require_self - */ diff --git a/decidim-proposals_extended/decidim-proposals_extended.gemspec b/decidim-proposals_extended/decidim-proposals_extended.gemspec index 45cac7e..f26d095 100644 --- a/decidim-proposals_extended/decidim-proposals_extended.gemspec +++ b/decidim-proposals_extended/decidim-proposals_extended.gemspec @@ -25,7 +25,5 @@ Gem::Specification.new do |spec| spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"] spec.add_dependency "decidim-core", Decidim::ProposalsExtended::DECIDIM_VERSION - spec.add_dependency "rails", "~> 5.2.6" - - spec.add_development_dependency "sqlite3" + spec.add_dependency "rails", "~> 6.0" end diff --git a/decidim-proposals_extended/lib/decidim/proposals_extended/version.rb b/decidim-proposals_extended/lib/decidim/proposals_extended/version.rb index d87f323..f2a995c 100644 --- a/decidim-proposals_extended/lib/decidim/proposals_extended/version.rb +++ b/decidim-proposals_extended/lib/decidim/proposals_extended/version.rb @@ -1,6 +1,6 @@ module Decidim module ProposalsExtended VERSION = '0.1.0' - DECIDIM_VERSION = "0.24.3" + DECIDIM_VERSION = "0.25.2" end end