Merge stuff

.idea/gradle.xml

@@ -4,33 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT">
-            <builds>
-              <build path="$PROJECT_DIR$/buildSrc" name="buildSrc">
-                <projects>
-                  <project path="$PROJECT_DIR$/buildSrc" />
-                </projects>
-              </build>
-            </builds>
-          </compositeBuild>
-        </compositeConfiguration>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/buildSrc" />
-            <option value="$PROJECT_DIR$/collect" />
-            <option value="$PROJECT_DIR$/core" />
             <option value="$PROJECT_DIR$/gson" />
-            <option value="$PROJECT_DIR$/gson-math" />
+            <option value="$PROJECT_DIR$/gson-linear-algebra" />
             <option value="$PROJECT_DIR$/guava" />
-            <option value="$PROJECT_DIR$/io" />
-            <option value="$PROJECT_DIR$/io-math" />
             <option value="$PROJECT_DIR$/linear-algebra" />
-            <option value="$PROJECT_DIR$/math" />
-            <option value="$PROJECT_DIR$/networking" />
           </set>
         </option>
       </GradleProjectSettings>

build.gradle.kts

@@ -16,18 +16,23 @@ tasks.compileKotlin {
 	}
 }
 
-tasks.jar {
-	from(project(":core").sourceSets.main.get().output)
-	from(project(":io").sourceSets.main.get().output)
-	from(project(":io-math").sourceSets.main.get().output)
-	from(project(":math").sourceSets.main.get().output)
-	from(project(":collect").sourceSets.main.get().output)
-	from(project(":guava").sourceSets.main.get().output)
-	from(project(":networking").sourceSets.main.get().output)
-}
-
 val projectGroup: String by project
 val projectVersion: String by project
+val specifyKotlinAsDependency: String by project
+val fastutilVersion: String by project
+
+dependencies {
+	testImplementation("org.jetbrains.kotlin:kotlin-test")
+
+	implementation("it.unimi.dsi:fastutil:$fastutilVersion")
+}
+
+tasks {
+	create("sourceJar", org.gradle.jvm.tasks.Jar::class.java) {
+		archiveClassifier.set("sources")
+		from(sourceSets.main.get().allSource)
+	}
+}
 
 version = projectVersion
 group = projectGroup
@@ -77,3 +82,33 @@ subprojects {
 		}
 	}
 }
+
+publishing {
+	publications {
+		create<MavenPublication>("mavenJava") {
+			from(components["java"])
+			artifact(tasks["sourceJar"])
+
+			pom {
+				dependencies {
+					if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
+
+					implementation("it.unimi.dsi:fastutil:[8.0,)")
+				}
+			}
+		}
+	}
+
+	repositories {
+		maven {
+			url = uri("sftp://maven@dbotthepony.ru:22/maven")
+
+			credentials {
+				val mavenUser: String by project
+				val mavenPassword: String by project
+				username = mavenUser
+				password = mavenPassword
+			}
+		}
+	}
+}

buildSrc/build.gradle.kts

@@ -1,8 +0,0 @@
-
-plugins {
-	kotlin("jvm") version "1.8.0"
-}
-
-repositories {
-	mavenCentral()
-}

collect/build.gradle.kts

@@ -1,37 +0,0 @@
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-val specifyKotlinAsDependency: String by project
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-kotlin {
-    jvmToolchain(17)
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                }
-            }
-        }
-    }
-}

core/build.gradle.kts

@@ -1,38 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-val specifyKotlinAsDependency: String by project
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-}
-
-tasks.test {
-    useJUnitPlatform()
-}
-
-kotlin {
-    jvmToolchain(17)
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                }
-            }
-        }
-    }
-}

gradle.properties

@@ -4,7 +4,8 @@ kotlin.code.style=official
 specifyKotlinAsDependency=false
 
 projectGroup=ru.dbotthepony.kommons
-projectVersion=1.1.0
+projectVersion=1.2.0
 
 guavaDepVersion=33.0.0
 gsonDepVersion=2.8.9
+fastutilVersion=8.5.6

gson-linear-algebra/build.gradle.kts

@@ -0,0 +1,21 @@
+
+plugins {
+    kotlin("jvm")
+}
+
+repositories {
+    mavenCentral()
+}
+
+val gsonDepVersion: String by project
+val specifyKotlinAsDependency: String by project
+
+dependencies {
+    testImplementation("org.jetbrains.kotlin:kotlin-test")
+
+	implementation(project(":linear-algebra"))
+	implementation(project(":gson"))
+	implementation(project(":"))
+
+    implementation("com.google.code.gson:gson:$gsonDepVersion")
+}

gson-math/build.gradle.kts

@@ -1,41 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-}
-
-repositories {
-    mavenCentral()
-}
-
-val gsonDepVersion: String by project
-val specifyKotlinAsDependency: String by project
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-
-    implementation("com.google.code.gson:gson:$gsonDepVersion")
-    implementation(project(":gson"))
-    implementation(project(":core"))
-    implementation(project(":math"))
-    implementation(project(":linear-algebra"))
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                    implementation("com.google.guava:guava:[2.0,)")
-                    implementation(project(":gson"))
-                    implementation(project(":core"))
-                    implementation(project(":math"))
-                    implementation(project(":linear-algebra"))
-                }
-            }
-        }
-    }
-}

gson/build.gradle.kts

@@ -9,12 +9,14 @@ repositories {
 
 val gsonDepVersion: String by project
 val specifyKotlinAsDependency: String by project
+val fastutilVersion: String by project
 
 dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 
     implementation("com.google.code.gson:gson:$gsonDepVersion")
-    implementation(project(":core"))
+    implementation(project(":"))
+    implementation("it.unimi.dsi:fastutil:$fastutilVersion")
 }
 
 publishing {
@@ -27,7 +29,8 @@ publishing {
                 dependencies {
                     if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
                     implementation("com.google.guava:guava:[2.0,)")
-                    implementation(project(":core"))
+                    implementation("it.unimi.dsi:fastutil:[8.0,)")
+                    implementation(project(":"))
                 }
             }
         }

io-math/build.gradle.kts

@@ -1,33 +0,0 @@
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-val specifyKotlinAsDependency: String by project
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-    implementation(project(":io"))
-    implementation(project(":math"))
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                    implementation(project(":io"))
-                    implementation(project(":math"))
-                }
-            }
-        }
-    }
-}

io/build.gradle.kts

@@ -1,31 +0,0 @@
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-val specifyKotlinAsDependency: String by project
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-    implementation(project(":core"))
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                    implementation(project(":core"))
-                }
-            }
-        }
-    }
-}

linear-algebra/build.gradle.kts

@@ -12,9 +12,7 @@ repositories {
 dependencies {
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 
-    implementation(project(":collect"))
+    implementation(project(":"))
-    implementation(project(":math"))
-    implementation(project(":core"))
 }
 
 publishing {
@@ -27,9 +25,7 @@ publishing {
                 dependencies {
                     if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
 
-                    implementation(project(":collect"))
+                    implementation(project(":"))
-                    implementation(project(":math"))
-                    implementation(project(":core"))
                 }
             }
         }

math/build.gradle.kts

@@ -1,31 +0,0 @@
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-val specifyKotlinAsDependency: String by project
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-
-    implementation(project(":core"))
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    if (specifyKotlinAsDependency.toBoolean()) implementation(kotlin("stdlib"))
-                }
-            }
-        }
-    }
-}

networking/build.gradle.kts

@@ -1,34 +0,0 @@
-
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-    implementation(project(":core"))
-    implementation(project(":io"))
-    implementation(project(":collect"))
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("mavenJava") {
-            from(components["java"])
-            artifact(tasks["sourceJar"])
-
-            pom {
-                dependencies {
-                    implementation(kotlin("stdlib"))
-                    implementation(project(":core"))
-                    implementation(project(":io"))
-                    implementation(project(":collect"))
-                }
-            }
-        }
-    }
-}

settings.gradle.kts

@@ -5,13 +5,7 @@ plugins {
 }
 
 rootProject.name = "kommons"
-include("core")
-include("networking")
-include("io")
-include("math")
-include("io-math")
-include("collect")
 include("guava")
-include("linear-algebra")
-include("gson-math")
 include("gson")
+include("linear-algebra")
+include("gson-linear-algebra")