Merged with upstream twine changes

Merge branch 'main' into organicmaps

.circleci/config.yml

@@ -1,38 +0,0 @@
-version: 2.0
-jobs:
-    "ruby-2.4":
-        docker:
-            - image: circleci/ruby:2.4
-        steps:
-            - checkout
-            - run: bundle install
-            - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports"
-    "ruby-2.5":
-        docker:
-            - image: circleci/ruby:2.5
-        steps:
-            - checkout
-            - run: bundle install
-            - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports"
-    "ruby-2.6":
-        docker:
-            - image: circleci/ruby:2.6
-        steps:
-            - checkout
-            - run: bundle install
-            - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports"
-    "ruby-2.7":
-        docker:
-            - image: circleci/ruby:2.7
-        steps:
-            - checkout
-            - run: bundle install
-            - run: bundle exec rake test TESTOPTS="--ci-dir=$CIRCLE_TEST_REPORTS/reports"
-workflows:
-    version: 2
-    build:
-        jobs:
-            - "ruby-2.4"
-            - "ruby-2.5"
-            - "ruby-2.6"
-            - "ruby-2.7"

.github/workflows/test.yml

@@ -0,0 +1,37 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Test
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake test

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.1.2 (2022-11-15)
+
+- Bugfix: Fixed a runtime error caused by a missing rexml dependency in Ruby 3 (#312)
+
 # 1.1.1 (2021-01-28)
 
 - Bugfix: Properly parse multiline comments in Android XML files (#300)

README.md

@@ -1,7 +1,5 @@
 # Twine
 
-[![Continuous Integration by CircleCI](https://circleci.com/gh/scelis/twine.svg?style=shield)](https://circleci.com/gh/scelis/twine)
-
 Twine is a command line tool for managing your strings and their translations. These are all stored in a single text file and then Twine uses this file to import and export localization files in a variety of types, including iOS and Mac OS X `.strings` files, Android `.xml` files, gettext `.po` files, and [jquery-localize][jquerylocalize] `.json` files. This allows individuals and companies to easily share translations across multiple projects, as well as export localization files in any format the user wants.
 
 ## Install

documentation/formatters.md

@@ -88,3 +88,8 @@ Multiple gems can also be specified in the yaml file.
 ```
 gems: [wicked_twine, some_other_plugin]
 ```
+
+## Sample Plugins
+
+* [appium-twine](https://github.com/appium/appium_twine)
+* [twine-flutter](https://github.com/tiknil/twine-flutter)

lib/twine/version.rb

@@ -1,3 +1,3 @@
 module Twine
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

twine.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |s|
   s.files       += Dir.glob("test/**/*")
   s.test_files   = Dir.glob("test/test_*")
 
-  s.required_ruby_version = ">= 2.4"
+  s.required_ruby_version = ">= 2.6"
+  s.add_runtime_dependency('rexml', "~> 3.2")
   s.add_runtime_dependency('rubyzip', "~> 2.0")
   s.add_runtime_dependency('safe_yaml', "~> 1.0")
-  s.add_runtime_dependency('rexml', "~> 3.1")
   s.add_development_dependency('rake', "~> 13.0")
   s.add_development_dependency('minitest', "~> 5.5")
   s.add_development_dependency('minitest-ci', "~> 3.0")