Merge pull request #144 from embulk/jruby-9.4.3.0-by-default-for-gem

Use JRuby 9.4.3.0 by default for gem and gemPush
embulk · Sep 25, 2023 · 72d0db7 · 72d0db7
2 parents c4fa4c7 + 7ef56fb
commit 72d0db7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/embulk/gradle/embulk_plugins/EmbulkPluginsPlugin.java b/src/main/java/org/embulk/gradle/embulk_plugins/EmbulkPluginsPlugin.java
@@ -290,6 +290,4 @@ private static String buildGemVersionFromMavenVersion(final String mavenVersion)
             return mavenVersion;
         }
     }
-
-    static final String DEFAULT_JRUBY = "org.jruby:jruby-complete:9.2.7.0";
 }
diff --git a/src/main/java/org/embulk/gradle/embulk_plugins/Gem.java b/src/main/java/org/embulk/gradle/embulk_plugins/Gem.java
@@ -106,7 +106,7 @@ public Gem() {
         this.generateGemspec.set(true);
 
         this.jruby = objectFactory.property(Object.class);
-        this.jruby.set(EmbulkPluginsPlugin.DEFAULT_JRUBY);
+        this.jruby.set(DEFAULT_JRUBY);
 
         this.getArchiveExtension().set("gem");
     }
@@ -490,6 +490,8 @@ private static String pathToStringWithSlashes(final Path path) {
         return builder.toString();
     }
 
+    static final String DEFAULT_JRUBY = "org.jruby:jruby-complete:9.4.3.0";
+
     private final Property<String> embulkPluginMainClass;
     private final Property<String> embulkPluginCategory;
     private final Property<String> embulkPluginType;

diff --git a/src/main/java/org/embulk/gradle/embulk_plugins/GemPush.java b/src/main/java/org/embulk/gradle/embulk_plugins/GemPush.java
@@ -70,7 +70,7 @@ public GemPush() {
         this.host = objectFactory.property(String.class);
 
         this.jruby = objectFactory.property(Object.class);
-        this.jruby.set(EmbulkPluginsPlugin.DEFAULT_JRUBY);
+        this.jruby.set(Gem.DEFAULT_JRUBY);
     }
 
     @Incremental
-Original file line number
+Diff line change
@@ Expand Up @@
                 return mavenVersion;
             }
         }
-        static final String DEFAULT_JRUBY = "org.jruby:jruby-complete:9.2.7.0";
     }