Skip to content

Commit

Permalink
Merge 032f007 into f12c2a5
Browse files Browse the repository at this point in the history
  • Loading branch information
oetiker committed Nov 12, 2019
2 parents f12c2a5 + 032f007 commit c4cb690
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 175 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ before_install:
cpanm -n Devel::Cover::Report::Coveralls

script:
perl Makefile.PL && make && cover -test -report coveralls +ignore example
perl Makefile.PL && make thirdparty && make && cover -test -report coveralls +ignore example
2 changes: 1 addition & 1 deletion lib/Mojolicious/Plugin/Qooxdoo.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use Mojo::Base 'Mojolicious::Plugin';
use File::Spec::Functions qw(splitdir updir catdir file_name_is_absolute);
use Cwd qw(abs_path);

our $VERSION = '1.0.5';
our $VERSION = '1.0.6';

sub register {
my ($self, $app, $conf) = @_;
Expand Down
9 changes: 7 additions & 2 deletions lib/Mojolicious/Plugin/Qooxdoo/JsonRpcController.pm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use Encode;

has toUTF8 => sub { find_encoding('utf8') };

our $VERSION = '1.0.5';
our $VERSION = '1.0.6';

has 'service';

Expand All @@ -25,7 +25,12 @@ has 'methodName';

has 'rpcParams';

has log => sub { shift->app->log };
has log => sub {
my $c = shift;
return $c->SUPER::log if $c->SUPER::can('log');
warn "APP LOG";
$c->app->log;
};

sub dispatch {
my $self = shift;
Expand Down
12 changes: 0 additions & 12 deletions setup/build-perl-modules.sh

This file was deleted.

159 changes: 0 additions & 159 deletions setup/sdbs.inc

This file was deleted.

0 comments on commit c4cb690

Please sign in to comment.