diff --git a/src/test/java/rife/bld/dependencies/TestDependencyResolver.java b/src/test/java/rife/bld/dependencies/TestDependencyResolver.java index 7e422e0..feeed0d 100644 --- a/src/test/java/rife/bld/dependencies/TestDependencyResolver.java +++ b/src/test/java/rife/bld/dependencies/TestDependencyResolver.java @@ -331,15 +331,17 @@ public class TestDependencyResolver { @Test void testGetCompileRuntimeDependenciesBitly() { - var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(0, 9, 4, "SNAPSHOT"))); + var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(2, 0, 0))); var dependencies = resolver.getDirectDependencies(compile, runtime); assertNotNull(dependencies); - assertEquals(4, dependencies.size()); + assertEquals(6, dependencies.size()); assertEquals(""" - org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 - com.squareup.okhttp3:okhttp:4.11.0 - com.squareup.okhttp3:logging-interceptor:4.11.0 - org.json:json:20230618""", StringUtils.join(dependencies, "\n")); + org.jetbrains.kotlin:kotlin-stdlib:2.1.10 + org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10 + org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10 + com.squareup.okhttp3:okhttp:4.12.0 + com.squareup.okhttp3:logging-interceptor:4.12.0 + org.json:json:20250107""", StringUtils.join(dependencies, "\n")); } @Test @@ -702,22 +704,22 @@ public class TestDependencyResolver { @Test void testGetCompileRuntimeTransitiveDependenciesBitly() { - var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(0, 9, 4, "SNAPSHOT"))); + var resolver = new DependencyResolver(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(2, 0, 0))); var dependencies = resolver.getAllDependencies(compile, runtime); assertNotNull(dependencies); assertEquals(11, dependencies.size()); assertEquals(""" - net.thauvin.erik:bitly-shorten:0.9.4-SNAPSHOT - org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 - com.squareup.okhttp3:okhttp:4.11.0 - com.squareup.okhttp3:logging-interceptor:4.11.0 - org.json:json:20230618 - org.jetbrains.kotlin:kotlin-stdlib:1.8.22 - org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 - com.squareup.okio:okio:3.2.0 - org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 + net.thauvin.erik:bitly-shorten:2.0.0 + org.jetbrains.kotlin:kotlin-stdlib:2.1.10 + org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10 + org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10 + com.squareup.okhttp3:okhttp:4.12.0 + com.squareup.okhttp3:logging-interceptor:4.12.0 + org.json:json:20250107 org.jetbrains:annotations:13.0 - com.squareup.okio:okio-jvm:3.2.0""", StringUtils.join(dependencies, "\n")); + org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10 + com.squareup.okio:okio:3.6.0 + com.squareup.okio:okio-jvm:3.6.0""", StringUtils.join(dependencies, "\n")); } @Test diff --git a/src/test/java/rife/bld/dependencies/TestDependencySet.java b/src/test/java/rife/bld/dependencies/TestDependencySet.java index 57a6459..81621fc 100644 --- a/src/test/java/rife/bld/dependencies/TestDependencySet.java +++ b/src/test/java/rife/bld/dependencies/TestDependencySet.java @@ -359,19 +359,19 @@ public class TestDependencySet { @Test void testGenerateDependencyTreeCompileRuntime() { var dependencies = new DependencySet() - .include(new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(0, 9, 4, "SNAPSHOT"))); + .include(new Dependency("net.thauvin.erik", "bitly-shorten", new VersionNumber(2, 0, 0))); assertEquals(StringUtils.convertLineSeparator(""" - └─ net.thauvin.erik:bitly-shorten:0.9.4-SNAPSHOT - ├─ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22 - │ ├─ org.jetbrains.kotlin:kotlin-stdlib:1.8.22 - │ │ ├─ org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22 - │ │ └─ org.jetbrains:annotations:13.0 - │ └─ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22 - ├─ com.squareup.okhttp3:okhttp:4.11.0 - │ └─ com.squareup.okio:okio:3.2.0 - │ └─ com.squareup.okio:okio-jvm:3.2.0 - ├─ com.squareup.okhttp3:logging-interceptor:4.11.0 - └─ org.json:json:20230618 - """), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY), compile, runtime)); + └─ net.thauvin.erik:bitly-shorten:2.0.0 + ├─ org.jetbrains.kotlin:kotlin-stdlib:2.1.10 + │ └─ org.jetbrains:annotations:13.0 + ├─ org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10 + ├─ org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10 + │ └─ org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10 + ├─ com.squareup.okhttp3:okhttp:4.12.0 + │ └─ com.squareup.okio:okio:3.6.0 + │ └─ com.squareup.okio:okio-jvm:3.6.0 + ├─ com.squareup.okhttp3:logging-interceptor:4.12.0 + └─ org.json:json:20250107 + """), dependencies.generateTransitiveDependencyTree(VersionResolution.dummy(), ArtifactRetriever.instance(), List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS), compile, runtime)); } }