diff --git a/README.md b/README.md index dbe4e21..f2eecbc 100644 --- a/README.md +++ b/README.md @@ -244,7 +244,7 @@ Available options: - [json](https://rubygems.org/gems/json) - [extlz4](https://rubygems.org/gems/extlz4) -- [extlzma](https://rubygems.org/gems/extlzma) +- [extlzma2](https://rubygems.org/gems/extlzma2) - [bin_utils](https://rubygems.org/gems/bin_utils) - [chunky_png](https://rubygems.org/gems/chunky_png) diff --git a/Rakefile b/Rakefile index 959de4d..f01eaca 100644 --- a/Rakefile +++ b/Rakefile @@ -12,11 +12,9 @@ task build: :compile ext_dirs = %w[decoders/native decoders/crunch] ext_dirs.each do |dir| - Rake::ExtensionTask.new(dir) do |ext| - ext.lib_dir = 'lib/mikunyan' - end + Rake::ExtensionTask.new(dir) end -task compile: ext_dirs.map{|e| "compile:#{e}".to_sym} +task compile: ext_dirs.map {|e| "compile:#{e}".to_sym} task default: %i[clobber compile spec] diff --git a/ext/decoders/crunch/extconf.rb b/ext/decoders/crunch/extconf.rb index 8da9927..28934c3 100644 --- a/ext/decoders/crunch/extconf.rb +++ b/ext/decoders/crunch/extconf.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'mkmf' have_library('stdc++') @@ -6,4 +8,5 @@ append_cppflags('-O2') append_cppflags('-Wall') append_cppflags('-Wextra') append_cppflags('-Wvla') -create_makefile('mikunyan/decoders/crunch') + +create_makefile('decoders/crunch') diff --git a/ext/decoders/native/extconf.rb b/ext/decoders/native/extconf.rb index 0a35626..5b4c04d 100644 --- a/ext/decoders/native/extconf.rb +++ b/ext/decoders/native/extconf.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'mkmf' append_cppflags('-std=c11') @@ -5,4 +7,5 @@ append_cppflags('-O2') append_cppflags('-Wall') append_cppflags('-Wextra') append_cppflags('-Wvla') -create_makefile('mikunyan/decoders/native') + +create_makefile('decoders/native') diff --git a/lib/mikunyan/asset_bundle.rb b/lib/mikunyan/asset_bundle.rb index a372b82..21428d5 100644 --- a/lib/mikunyan/asset_bundle.rb +++ b/lib/mikunyan/asset_bundle.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'extlz4' -require 'extlzma' +require 'extlzma2' require 'mikunyan/asset' require 'mikunyan/binary_reader' diff --git a/mikunyan.gemspec b/mikunyan.gemspec index cbc6b15..57fba90 100644 --- a/mikunyan.gemspec +++ b/mikunyan.gemspec @@ -14,20 +14,20 @@ Gem::Specification.new do |spec| spec.description = 'Library to deserialize Unity assetbundles and assets.' spec.homepage = 'https://github.com/Ishotihadus/mikunyan' spec.license = 'MIT' + spec.required_ruby_version = '>= 2.6.0' - spec.files = `git ls-files -z`.split("\x0").reject do |f| + spec.files = `git ls-files -z`.split("\x0").reject do |f| f.match(%r{^(test|spec|features)/}) end spec.bindir = 'exe' - spec.executables = spec.files.grep(%r{^exe/}){|f| File.basename(f)} + spec.executables = spec.files.grep(%r{^exe/}) {|f| File.basename(f)} spec.require_paths = ['lib'] spec.extensions = ['ext/decoders/native/extconf.rb', 'ext/decoders/crunch/extconf.rb'] spec.add_dependency 'bin_utils', '~> 0' spec.add_dependency 'chunky_png', '~> 1' spec.add_dependency 'extlz4', '~> 0' - spec.add_dependency 'extlzma', '~> 0' - spec.add_dependency 'json', '~> 2' + spec.add_dependency 'extlzma2', '~> 2' spec.add_development_dependency 'bundler', '~> 2' spec.add_development_dependency 'oily_png', '~> 1'