Remove api-models submodule

(cherry picked from commit 2c9c4ee)
JetBrains · Mar 14, 2024 · 184bd59 · 184bd59
1 parent 30dad44
commit 184bd59
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 19 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/.run/Package Search Plugin.run.xml b/.run/Package Search Plugin.run.xml
@@ -2,6 +2,11 @@
   <configuration default="false" name="Package Search Plugin" type="GradleRunConfiguration" factoryName="Gradle">
     <log_file alias="idea.log" path="$PROJECT_DIR$/plugin/build/idea-sandbox/system/log/idea.log" />
     <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="GITHUB_REF" value="refs/tags/241.0.8"/>
+        </map>
+      </option>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />

diff --git a/.run/[KMP] Package Search Plugin.run.xml b/.run/[KMP] Package Search Plugin.run.xml
@@ -5,6 +5,7 @@
       <option name="env">
         <map>
           <entry key="KMP" value="true"/>
+          <entry key="GITHUB_REF" value="refs/tags/241.0.8"/>
         </map>
       </option>
       <option name="executionName" />

diff --git a/package-search-api-models b/package-search-api-models
diff --git a/packagesearch.versions.toml b/packagesearch.versions.toml
@@ -19,7 +19,7 @@ kotlinxSerialization = "1.6.0"
 ktor = "2.3.5"
 logback = "1.4.11"
 nitrite = "3.4.4"
-packagesearchApiModels = "3.0.0-SNAPSHOT"
+packagesearchApiModels = "3.0.0"
 jewel = "0.15.0"
 
 [libraries]

diff --git a/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KMPUtils.kt b/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KMPUtils.kt
@@ -190,7 +190,7 @@ suspend fun Module.getKMPVariants(
                 dependencies.map { artifactModel ->
                     PackageSearchKotlinMultiplatformDeclaredDependency.Maven(
                         id = artifactModel.packageId,
-                        declaredVersion = artifactModel.version?.let { NormalizedVersion.fromStringOrNull(it) },
+                        declaredVersion = artifactModel.version?.let { NormalizedVersion.from(it) },
                         remoteInfo = dependencyInfo[artifactModel.packageId] as? ApiMavenPackage,
                         declarationIndexes = artifactModel.indexes,
                         groupId = artifactModel.groupId,

diff --git a/plugin/gradle/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/utils/GradleUtils.kt b/plugin/gradle/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/utils/GradleUtils.kt
@@ -167,7 +167,7 @@ suspend fun Module.getDeclaredDependencies(buildFile: Path): List<PackageSearchG
         .map { declaredDependency ->
             PackageSearchGradleDeclaredPackage(
                 id = declaredDependency.packageId,
-                declaredVersion = declaredDependency.version?.let { NormalizedVersion.fromStringOrNull(it) },
+                declaredVersion = declaredDependency.version?.let { NormalizedVersion.from(it) },
                 remoteInfo = remoteInfo[declaredDependency.packageId] as? ApiMavenPackage,
                 icon = remoteInfo[declaredDependency.packageId]?.icon
                     ?: IconProvider.Icons.MAVEN,

diff --git a/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/MavenUtils.kt b/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/MavenUtils.kt
@@ -158,7 +158,7 @@ suspend fun Module.getDeclaredDependencies(): List<PackageSearchDeclaredBaseMave
         .mapNotNull { (packageId, declaredDependency) ->
             PackageSearchDeclaredBaseMavenPackage(
                 id = packageId,
-                declaredVersion = declaredDependency.version?.let { NormalizedVersion.fromStringOrNull(it) },
+                declaredVersion = declaredDependency.version?.let { NormalizedVersion.from(it) },
                 remoteInfo = remoteInfo[packageId]?.asMavenApiPackage(),
                 groupId = declaredDependency.groupId,
                 artifactId = declaredDependency.artifactId,

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,7 +3,7 @@
 rootProject.name = "packagesearch-intellij-plugin"
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
     id("com.gradle.enterprise") version "3.14.1"
 }
 
@@ -29,15 +29,6 @@ include(
     ":kmp-modifier",
 )
 
-includeBuild("package-search-api-models") {
-    dependencySubstitution {
-        substitute(module("org.jetbrains.packagesearch:packagesearch-api-models")).using(project(":"))
-        substitute(module("org.jetbrains.packagesearch:packagesearch-http-models")).using(project(":http"))
-        substitute(module("org.jetbrains.packagesearch:packagesearch-api-client")).using(project(":http:client"))
-        substitute(module("org.jetbrains.packagesearch:packagesearch-build-systems-models")).using(project(":build-systems"))
-    }
-}
-
 val isCi
     get() = System.getenv("CI") == "true"