diff --git a/lib/modules/manager/deps-edn/__fixtures__/deps.edn b/lib/modules/manager/deps-edn/__fixtures__/deps.edn index c1c3a2b5ea86cd6493525a615ce057f6f8a1dbe5..fef799dcd7a6cdc737f409dda40e58f1ad1cafa4 100644 --- a/lib/modules/manager/deps-edn/__fixtures__/deps.edn +++ b/lib/modules/manager/deps-edn/__fixtures__/deps.edn @@ -3,6 +3,7 @@ ,,,,persistent-sorted-set,{:mvn/version,"0.1.2"} invalid/package! {:mvn/version "1.2.3"} invalid/version nil + io.github.nextjournal/clerk {:mvn/version "0.7.418"} } :aliases { diff --git a/lib/modules/manager/deps-edn/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/deps-edn/__snapshots__/extract.spec.ts.snap index 7b7a98f13b781355e9ece944acb0ca06ddbb01e7..81aa96516bd90e5a422c94d6db3e001ccde51297 100644 --- a/lib/modules/manager/deps-edn/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/deps-edn/__snapshots__/extract.spec.ts.snap @@ -14,6 +14,18 @@ Array [ ], "replaceString": "{:mvn/version,\\"0.1.2\\"}", }, + Object { + "currentValue": "0.7.418", + "datasource": "clojure", + "depName": "io.github.nextjournal/clerk", + "packageName": "io.github.nextjournal:clerk", + "registryUrls": Array [ + "https://deps.com/foo/bar", + "https://my.auth.com/repo", + "s3://my-bucket/maven/releases", + ], + "replaceString": "{:mvn/version \\"0.7.418\\"}", + }, Object { "currentValue": "1.9.0", "datasource": "clojure", diff --git a/lib/modules/manager/deps-edn/__snapshots__/parser.spec.ts.snap b/lib/modules/manager/deps-edn/__snapshots__/parser.spec.ts.snap index 5c9e49ed0859c3a3afa1a4321da88c945720640a..8e28118109eaedf19a32f1d352601420868fefab 100644 --- a/lib/modules/manager/deps-edn/__snapshots__/parser.spec.ts.snap +++ b/lib/modules/manager/deps-edn/__snapshots__/parser.spec.ts.snap @@ -123,6 +123,9 @@ Object { "mvn/version": "1.2.3", }, "invalid/version": "nil", + "io.github.nextjournal/clerk": Object { + "mvn/version": "0.7.418", + }, "persistent-sorted-set": Object { "mvn/version": "0.1.2", }, diff --git a/lib/modules/manager/deps-edn/extract.spec.ts b/lib/modules/manager/deps-edn/extract.spec.ts index 39a1cd48d9f485cbfbe5f7707b0abb1c28eacdd2..f64246cdebdca617d9f8b66574c953812bd4ce94 100644 --- a/lib/modules/manager/deps-edn/extract.spec.ts +++ b/lib/modules/manager/deps-edn/extract.spec.ts @@ -20,6 +20,11 @@ describe('modules/manager/deps-edn/extract', () => { 's3://my-bucket/maven/releases', ], }, + { + depName: 'io.github.nextjournal/clerk', + currentValue: '0.7.418', + datasource: 'clojure', + }, { depName: 'org.clojure/clojure', currentValue: '1.9.0' }, { depName: 'org.clojure/clojure', currentValue: '1.10.0' }, { depName: 'org.clojure/clojurescript', currentValue: '1.10.520' }, diff --git a/lib/modules/manager/deps-edn/extract.ts b/lib/modules/manager/deps-edn/extract.ts index dc4beab35385f80d7e4f0d7167d82b7a61e200be..cfb29701945aaa96daecd98d4a140414fcf7dbf9 100644 --- a/lib/modules/manager/deps-edn/extract.ts +++ b/lib/modules/manager/deps-edn/extract.ts @@ -151,6 +151,15 @@ function extractDependency( dep.depType = depType; } + const mvnVersion = val['mvn/version']; + if (is.string(mvnVersion)) { + dep.datasource = ClojureDatasource.id; + dep.currentValue = mvnVersion; + dep.packageName = packageName.replace('/', ':'); + dep.registryUrls = [...mavenRegistries]; + return dep; + } + resolveGitPackageFromEdnVal(dep, val); resolveGitPackageFromEdnKey(dep, key); @@ -169,15 +178,6 @@ function extractDependency( return dep; } - const mvnVersion = val['mvn/version']; - if (is.string(mvnVersion)) { - dep.datasource = ClojureDatasource.id; - dep.currentValue = mvnVersion; - dep.packageName = packageName.replace('/', ':'); - dep.registryUrls = [...mavenRegistries]; - return dep; - } - return null; }