From 5e3bfba0ea2ef83f07fe33ece9e7d7947c2a24e3 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Mon, 24 Jul 2023 18:25:21 +0100
Subject: [PATCH] fix(build): ensure Klogger::VERSION is set correctly in built
 gems

This requires "klogger/version" by default, and also includes any
VERSION from in the repository when building the gem, to ensure that
"Klogger::VERSION" has the correct value. Previously it would always end
up returning "0.0.0.dev".
---
 .gitignore             | 1 -
 klogger-logger.gemspec | 3 ++-
 lib/klogger/logger.rb  | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8c35c8f..b844b14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 Gemfile.lock
-VERSION
diff --git a/klogger-logger.gemspec b/klogger-logger.gemspec
index be098dd..7092001 100644
--- a/klogger-logger.gemspec
+++ b/klogger-logger.gemspec
@@ -10,7 +10,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.6'
   s.homepage      = 'https://github.com/krystal/klogger'
   s.version       = Klogger::VERSION
-  s.files         = Dir.glob('{lib}/**/*')
+  s.files         = Dir.glob(File.join('{lib}', '**', '*')) +
+                    Dir['{README.*,*LICENSE*,VERSION}']
   s.require_paths = ['lib']
   s.authors       = ['Adam Cooke']
   s.email         = ['adam@krystal.uk']
diff --git a/lib/klogger/logger.rb b/lib/klogger/logger.rb
index d37232d..b1487c9 100644
--- a/lib/klogger/logger.rb
+++ b/lib/klogger/logger.rb
@@ -2,11 +2,14 @@
 
 require 'logger'
 require 'securerandom'
+
+require 'concurrent/atomic/thread_local_var'
+
 require 'klogger/formatters/json'
 require 'klogger/formatters/simple'
 require 'klogger/formatters/go'
-require 'concurrent/atomic/thread_local_var'
 require 'klogger/group_set'
+require 'klogger/version'
 
 module Klogger
   class Logger < ::Logger