google-guava 28.1.r01-java → 31.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62bb3ecdb3b207571c532150070f9b5c03b3b4e9bc08cfca03c42ee62b181c46
-  data.tar.gz: 83201585cb370688bd2d6b6db88da5a4dda77e6899669395b476fcb775b29fed
+  metadata.gz: adc9243dfe1531bc3536c1d7d0d3ec2868201726c6f76983ed9381d670117fc1
+  data.tar.gz: 7cc66e9e0355f1e86d05c753fd9ae517b7f58d157f05642a0b60f94008b86047
 SHA512:
-  metadata.gz: d215dac6e61ee4471f92f4a21e3b85fc6ea02e0258f572509d9a2c0b0041362caf32e399611833d4cc06f2ee3e143aa70a12a84fb511f60f4f3bc0fd1a1ebda9
-  data.tar.gz: c2e2d2912299b38106f810673be710b05b0188aa0c2ee2c12a0cf6d6772061a4a50e0da392e60f196c451c2d81d92c68454efe3f6291a91bf28bd07622602408
+  metadata.gz: 3962b48fc3aa9db21062ab3292a508693bd6de3c6b237ef4ae534152861b00ee112905b9e42b37f109607a1ed76139e694946457a4abfd331a4a911b5ec28e1e
+  data.tar.gz: f6f79ecf86011bf7f6c3601b74488ebf3c4c4d7d94f252180c40eb47963fe47b7331698493894308ac8673ee0e8ac7402e3f53323cf9fb7a168163dab354e57b

data/Rakefile

@@ -1,18 +1,17 @@
+# encoding: utf-8
+# frozen_string_literal: false
+
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-# encoding: utf-8
 
 require 'digest'
 require 'rake'
 require 'rake/clean'
 
-load 'google-guava.gemspec'
+load "#{File.basename(__dir__)}.gemspec"
 
-SOURCE_PATH = File.expand_path(File.dirname(__FILE__))
-GEM_SPEC_FILENAME = "#{GEM_SPEC.name}.gemspec"
-GEM_FILENAME = "#{GEM_SPEC.full_name}.gem"
-CLEAN.add 'lib/**/*.jar', 'tmp'
-CLOBBER.add '*.gem', 'pkg'
+CLEAN.add File.join('lib', '**', '*.jar'), File.join('tmp', '**', '*'), 'tmp'
+CLOBBER.add '*.gem', File.join('ext', 'apache-maven-*'), File.join('ext', '.m2'), 'pkg'
 
 desc 'Resolve dependencies'
 task :dependencies do
@@ -20,35 +19,46 @@ task :dependencies do
   GEM_SPEC.extensions.each { |path| require_relative path }
   # Avoid invocation of the extension configurator upon user installation of gem
   GEM_SPEC.extensions.clear
-  jar_paths = jars '~/.m2/repository', 'com/google/guava'
-  FileUtils.cp jar_paths, 'lib/guava'
+  jar_paths = jars(File.join('com', 'google', 'guava'))
+  FileUtils.cp(jar_paths, File.join('lib', 'guava'))
 end
 
 desc 'Assemble the gem package'
 task :package do
   require 'fileutils'
-  package_dir_path = File.join('pkg', GEM_SPEC.full_name)
-  FileUtils.mkdir_p package_dir_path
-  FileUtils.cp_r 'ext', package_dir_path
-  FileUtils.cp_r 'lib', package_dir_path
-  FileUtils.cp ['LICENSE.txt', 'Rakefile', 'README.md'], package_dir_path
-  package_gemspec_file_path = File.join(package_dir_path, GEM_SPEC_FILENAME)
+  GEM_SPEC.files = GEM_SPEC_FILES.call if defined?(GEM_SPEC_FILES)
+  gem_spec_name = GEM_SPEC.name
+  gem_spec_full_name = GEM_SPEC.full_name
+  package_dir_path = File.join('pkg', gem_spec_full_name)
+  FileUtils.mkdir_p(package_dir_path)
+  GEM_SPEC.files.each do |path|
+    FileUtils.mkdir_p(File.join(package_dir_path, File.dirname(path)))
+    FileUtils.cp_r(path, File.join(package_dir_path, path))
+  end
+  gem_spec_file_name = "#{gem_spec_name}.gemspec"
+  package_gemspec_file_path = File.join(package_dir_path, gem_spec_file_name)
   File.open(package_gemspec_file_path, 'w') do |io|
     io.write(GEM_SPEC.to_ruby)
   end
 end
-task package: :dependencies
+task package: [:clobber, :dependencies]
 
 desc 'Build the gem from the assembled package'
 task :gem do
-  package_dir_path = File.join('pkg', GEM_SPEC.full_name)
-  Rake::Task[:package].invoke unless File.directory? package_dir_path
-  gem_file_path = File.join(package_dir_path, GEM_FILENAME)
+  # Reload the gem spec version
+  GEM_SPEC.version = Guava::release_version
+  gem_spec_full_name = GEM_SPEC.full_name
+  package_dir_path = File.join('pkg', gem_spec_full_name)
   Dir.chdir(package_dir_path) do
-    system('jgem', 'build', GEM_SPEC_FILENAME)
+    system('jgem', 'build')
   end
-  FileUtils.mv gem_file_path, SOURCE_PATH if File.exists? gem_file_path
+  gem_file_name = "#{gem_spec_full_name}.gem"
+  gem_file_path = File.join(package_dir_path, gem_file_name)
+  project_path = File.expand_path(__dir__)
+  FileUtils.mv(gem_file_path, project_path) if File.exists?(gem_file_path)
+  Rake::Task[:verify]&.invoke
 end
+task gem: [:spec, :package]
 
 # Unit tests
 begin
@@ -60,25 +70,26 @@ begin
 
   desc 'Run unit tests'
   RSpec::Core::RakeTask.new(:spec) do |task|
-    task.pattern = 'spec/rake/*_spec.rb'
+    task.pattern = File.join('spec', 'rake', '*_spec.rb')
   end
 
   desc 'Run coverage'
   RSpec::Core::RakeTask.new(:rcov) do |task|
     task.rcov = true
-    task.pattern = 'spec/rake/*_spec.rb'
+    task.pattern = File.join('spec', 'rake', '*_spec.rb')
   end
 
   desc 'Run gem verification tests'
   RSpec::Core::RakeTask.new(:verify) do |task|
-    gem_path = File.join(SOURCE_PATH, GEM_FILENAME)
+    project_path = File.expand_path(__dir__)
+    gem_spec_full_name = GEM_SPEC.full_name
+    gem_file_name = "#{gem_spec_full_name}.gem"
+    gem_path = File.join(project_path, gem_file_name)
     ENV['GEM_PATH'] = gem_path
-    ENV['GEM_SPEC_FULL_NAME'] = GEM_SPEC.full_name
+    ENV['GEM_SPEC_FULL_NAME'] = gem_spec_full_name
     Rake::Task[:gem].invoke unless File.exists? gem_path
-    task.pattern = 'spec/verify/*_spec.rb'
+    task.pattern = File.join('spec', 'verify', '*_spec.rb')
   end
-
-  task :default => :spec
 rescue LoadError
   # no rspec available
   puts "To install rspec run: jgem install rspec"
@@ -88,9 +99,13 @@ end
 
 desc 'Upload gem to https://rubygems.org/'
 task :publish do
-  gem_path = File.join(SOURCE_PATH, GEM_FILENAME)
+  project_path = File.expand_path(__dir__)
+  gem_spec_full_name = GEM_SPEC.full_name
+  gem_file_name = "#{gem_spec_full_name}.gem"
+  gem_path = File.join(project_path, gem_file_name)
   Rake::Task[:gem].invoke unless File.exists? gem_path
   system('jgem', 'push', gem_path)
 end
 task publish: :verify
 
+task default: :gem

data/google-guava.gemspec

@@ -1,37 +1,36 @@
 # -*- encoding: utf-8 -*-
-# stub: google-guava 28.1.r01 java lib
+# stub: google-guava 31.1.1 java lib
 
 Gem::Specification.new do |s|
   s.name = "google-guava".freeze
-  s.version = "28.1.r01"
+  s.version = "31.1.1"
   s.platform = "java".freeze
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
-  s.metadata = { "bug_tracker_uri" => "https://gitlab.com/nelsnelson/google-guava/issues", "canonical_pom_uri" => "https://search.maven.org/remotecontent?filepath=com/google/guava/guava/28.1-jre/guava-28.1-jre.pom", "source_code_uri" => "https://gitlab.com/nelsnelson/google-guava" } if s.respond_to? :metadata=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.metadata = { "bug_tracker_uri" => "https://gitlab.com/nelsnelson/google-guava/issues", "canonical_pom_uri" => "https://search.maven.org/remotecontent?filepath=com/google/guava/guava/31.1-jre/guava-31.1-jre.pom", "source_code_uri" => "https://gitlab.com/nelsnelson/google-guava" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["Nels Nelson".freeze]
-  s.date = "2019-08-28"
+  s.date = "2022-06-26"
   s.description = "Guava is a set of core libraries that includes new collection types (such as multimap and multiset), immutable collections, a graph library, and utilities for concurrency, I/O, hashing, primitives, strings, and more!".freeze
   s.email = "nels@nelsnelson.org".freeze
-  s.files = ["LICENSE.txt".freeze, "README.md".freeze, "Rakefile".freeze, "google-guava.gemspec".freeze, "lib/guava.rb".freeze, "lib/guava/failureaccess-1.0.1.jar".freeze, "lib/guava/guava-19.0.jar".freeze, "lib/guava/guava-21.0.jar".freeze, "lib/guava/guava-28.1-jre.jar".freeze, "lib/guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar".freeze, "lib/guava/version.rb".freeze]
+  s.files = ["LICENSE.txt".freeze, "README.md".freeze, "Rakefile".freeze, "google-guava.gemspec".freeze, "lib/google-guava.rb".freeze, "lib/guava.rb".freeze, "lib/guava/failureaccess-1.0.1.jar".freeze, "lib/guava/guava-31.1-jre.jar".freeze, "lib/guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar".freeze, "lib/guava/version.rb".freeze]
   s.homepage = "https://rubygems.org/gems/google-guava".freeze
   s.licenses = ["Apache-2.0".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.5.3".freeze)
-  s.rubygems_version = "2.7.9".freeze
-  s.summary = "Google Guava java jars packaged as a gem.".freeze
+  s.rubygems_version = "3.2.29".freeze
+  s.summary = "The Google Guava java jars packaged as a gem.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake>.freeze, ["~> 12.3", ">= 12.3.2"])
-      s.add_development_dependency(%q<rspec>.freeze, [">= 3.8.0", "~> 3.8"])
-    else
-      s.add_dependency(%q<rake>.freeze, ["~> 12.3", ">= 12.3.2"])
-      s.add_dependency(%q<rspec>.freeze, [">= 3.8.0", "~> 3.8"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<rake>.freeze, ["~> 13.0.6"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.11.0"])
+    s.add_development_dependency(%q<rubocop>.freeze, ["~> 1.25.0"])
   else
-    s.add_dependency(%q<rake>.freeze, ["~> 12.3", ">= 12.3.2"])
-    s.add_dependency(%q<rspec>.freeze, [">= 3.8.0", "~> 3.8"])
+    s.add_dependency(%q<rake>.freeze, ["~> 13.0.6"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.11.0"])
+    s.add_dependency(%q<rubocop>.freeze, ["~> 1.25.0"])
   end
 end

data/lib/google-guava.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+# frozen_string_literal: false
+
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+require_relative 'guava'

data/lib/guava/version.rb

@@ -1,11 +1,24 @@
 # encoding: utf-8
+# frozen_string_literal: false
+
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
 
 module Guava
-  VERSION = ['28.1']
-  GEM_RELEASE = 'r01'
+  def self.version
+    File.read('version').chomp
+  end
 
-  def Guava.version(release=GEM_RELEASE)
-    VERSION << release unless release.nil?
-    VERSION.join('.').freeze
+  def self.release
+    File.read('release').chomp
   end
+
+  def self.release_version(release = Guava.release)
+    release_version = [Guava.version]
+    release_version << release unless release.nil?
+    release_version.join('.').freeze
+  end
+
+  VERSION = Guava.version
+  GEM_RELEASE = Guava.release
 end

metadata

@@ -1,24 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: google-guava
 version: !ruby/object:Gem::Version
-  version: 28.1.r01
+  version: 31.1.1
 platform: java
 authors:
 - Nels Nelson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2022-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: 13.0.6
   name: rake
   prerelease: false
   type: :development
@@ -26,30 +23,35 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 3.11.0
   name: rspec
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.11.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 1.25.0
+  name: rubocop
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 1.25.0
 description: Guava is a set of core libraries that includes new collection types (such
   as multimap and multiset), immutable collections, a graph library, and utilities
   for concurrency, I/O, hashing, primitives, strings, and more!
@@ -62,11 +64,10 @@ files:
 - README.md
 - Rakefile
 - google-guava.gemspec
+- lib/google-guava.rb
 - lib/guava.rb
 - lib/guava/failureaccess-1.0.1.jar
-- lib/guava/guava-19.0.jar
-- lib/guava/guava-21.0.jar
-- lib/guava/guava-28.1-jre.jar
+- lib/guava/guava-31.1-jre.jar
 - lib/guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
 - lib/guava/version.rb
 homepage: https://rubygems.org/gems/google-guava
@@ -74,7 +75,7 @@ licenses:
 - Apache-2.0
 metadata:
   bug_tracker_uri: https://gitlab.com/nelsnelson/google-guava/issues
-  canonical_pom_uri: https://search.maven.org/remotecontent?filepath=com/google/guava/guava/28.1-jre/guava-28.1-jre.pom
+  canonical_pom_uri: https://search.maven.org/remotecontent?filepath=com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
   source_code_uri: https://gitlab.com/nelsnelson/google-guava
 post_install_message:
 rdoc_options: []
@@ -87,13 +88,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
-summary: Google Guava java jars packaged as a gem.
+summary: The Google Guava java jars packaged as a gem.
 test_files: []