Merge pull request #3364 from dependabot/feelepxyz/gradle-maven-dev

Treat dev and pr as pre-releases for gradle/maven
dependabot · Mar 26, 2021 · 43dc9e0 · 43dc9e0
2 parents 59fab87 + 4eda81b
commit 43dc9e0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/gradle/lib/dependabot/gradle/version.rb b/gradle/lib/dependabot/gradle/version.rb
@@ -21,7 +21,7 @@ class Version < Gem::Version
         "b" => 2, "beta"      => 2,
         "m" => 3, "milestone" => 3,
         "rc" => 4, "cr" => 4, "pr" => 4,
-        "snapshot" => 5,
+        "snapshot" => 5, "dev" => 5,
         "ga" => 6, "" => 6, "final" => 6,
         "sp" => 7
       }.freeze

diff --git a/gradle/spec/dependabot/gradle/version_spec.rb b/gradle/spec/dependabot/gradle/version_spec.rb
@@ -92,6 +92,11 @@
       let(:version_string) { "1.2.1-1.3.40-eap13-67" }
       it { is_expected.to eq(true) }
     end
+
+    context "with a dev token" do
+      let(:version_string) { "1.2.1-dev-65" }
+      it { is_expected.to eq(true) }
+    end
   end
 
   describe "#<=>" do

diff --git a/maven/lib/dependabot/maven/version.rb b/maven/lib/dependabot/maven/version.rb
@@ -21,8 +21,8 @@ class Version < Gem::Version
         "a" => 1, "alpha"     => 1,
         "b" => 2, "beta"      => 2,
         "m" => 3, "milestone" => 3,
-        "rc" => 4, "cr" => 4,
-        "snapshot" => 5,
+        "rc" => 4, "cr" => 4, "pr" => 4,
+        "snapshot" => 5, "dev" => 5,
         "ga" => 6, "" => 6, "final" => 6,
         "sp" => 7
       }.freeze

diff --git a/maven/spec/dependabot/maven/version_spec.rb b/maven/spec/dependabot/maven/version_spec.rb
@@ -92,6 +92,16 @@
       let(:version_string) { "1.0.0.sp7" }
       it { is_expected.to eq(false) }
     end
+
+    context "with a pre-release" do
+      let(:version_string) { "2.10.0.pr3" }
+      it { is_expected.to eq(true) }
+    end
+
+    context "with a dev token" do
+      let(:version_string) { "1.2.1-dev-65" }
+      it { is_expected.to eq(true) }
+    end
   end
 
   describe "#<=>" do