Merge pull request #329 from libp2p/1.0.1

libp2p · Sep 16, 2023 · 433d0b1 · 433d0b1
2 parents 115a481 + 64c6783
commit 433d0b1
Show file tree

Hide file tree

Showing 167 changed files with 7,148 additions and 6,848 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text eol=lf
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,20 @@
+name: publish
+on:
+  push:
+    branches:
+      - "develop"
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Publish to Cloudsmith
+        run: ./gradlew publish -PcloudsmithUser=${{ secrets.CLOUDSMITH_USER }} -PcloudsmithApiKey=${{ secrets.CLOUDSMITH_API_KEY }}
diff --git a/README.md b/README.md
@@ -98,14 +98,6 @@ Add the required repositories  to the `dependencyManagement` section of the pom
   <repository>
     <id>libp2p-jvm-libp2p</id>
     <url>https://dl.cloudsmith.io/public/libp2p/jvm-libp2p/maven/</url>
-    <releases>
-      <enabled>true</enabled>
-      <updatePolicy>always</updatePolicy>
-    </releases>
-    <snapshots>
-      <enabled>true</enabled>
-      <updatePolicy>always</updatePolicy>
-    </snapshots>
   </repository>
   <repository>
     <id>JitPack</id>
@@ -123,7 +115,6 @@ Add the library to the `dependencies` section of the pom file:
   <groupId>io.libp2p</groupId>
   <artifactId>jvm-libp2p</artifactId>
   <version>X.Y.Z-RELEASE</version>
-  <type>pom</type>
 </dependency>
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,26 +1,27 @@
+import com.diffplug.gradle.spotless.SpotlessExtension
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.net.URL
 
 // To publish the release artifact to CloudSmith repo run the following :
 // ./gradlew publish -PcloudsmithUser=<user> -PcloudsmithApiKey=<api-key>
 
-description = "an implementation of libp2p for the jvm"
+description = "a libp2p implementation for the JVM, written in Kotlin"
 
 plugins {
     val kotlinVersion = "1.6.21"
 
     id("org.jetbrains.kotlin.jvm") version kotlinVersion apply false
 
-    id("com.github.ben-manes.versions").version("0.44.0")
+    id("com.github.ben-manes.versions").version("0.48.0")
     id("idea")
     id("io.gitlab.arturbosch.detekt").version("1.22.0")
     id("java")
     id("maven-publish")
-    id("org.jetbrains.dokka").version("1.7.20")
-    id("org.jmailen.kotlinter").version("3.10.0")
+    id("org.jetbrains.dokka").version("1.9.0")
+    id("com.diffplug.spotless").version("6.21.0")
     id("java-test-fixtures")
-    id("io.spring.dependency-management").version("1.1.0")
+    id("io.spring.dependency-management").version("1.1.3")
 
     id("org.jetbrains.kotlin.android") version kotlinVersion apply false
     id("com.android.application") version "7.4.2" apply false
@@ -36,7 +37,7 @@ configure(
         }
 ) {
     group = "io.libp2p"
-    version = "1.0.0-RELEASE"
+    version = "1.0.1-RELEASE"
 
     apply(plugin = "kotlin")
     apply(plugin = "idea")
@@ -45,7 +46,7 @@ configure(
     apply(plugin = "io.gitlab.arturbosch.detekt")
     apply(plugin = "maven-publish")
     apply(plugin = "org.jetbrains.dokka")
-    apply(plugin = "org.jmailen.kotlinter")
+    apply(plugin = "com.diffplug.spotless")
     apply(plugin = "java-test-fixtures")
     apply(plugin = "io.spring.dependency-management")
     apply(from = "$rootDir/versions.gradle")
@@ -57,7 +58,6 @@ configure(
 
         implementation("com.google.guava:guava")
         implementation("org.slf4j:slf4j-api")
-        implementation("com.github.multiformats:java-multibase:v1.1.1")
 
         testFixturesImplementation("com.google.guava:guava")
         testFixturesImplementation("org.slf4j:slf4j-api")
@@ -108,8 +108,21 @@ configure(
 //    Runtime.getRuntime().availableProcessors().div(2))
     }
 
-    kotlinter {
-        disabledRules = arrayOf("no-wildcard-imports", "enum-entry-name-case")
+    configure<SpotlessExtension> {
+        kotlin {
+            ktlint().editorConfigOverride(
+                mapOf(
+                    "ktlint_standard_no-wildcard-imports" to "disabled",
+                    "ktlint_standard_enum-entry-name-case" to "disabled",
+                    "ktlint_standard_trailing-comma-on-call-site" to "disabled",
+                    "ktlint_standard_trailing-comma-on-declaration-site" to "disabled"
+                )
+            )
+        }
+        java {
+            targetExclude("**/generated/**/proto/**")
+            googleJavaFormat()
+        }
     }
 
     val sourcesJar by tasks.registering(Jar::class) {

diff --git a/examples/chatter/src/main/kotlin/io/libp2p/example/chat/ChatNode.kt b/examples/chatter/src/main/kotlin/io/libp2p/example/chat/ChatNode.kt
@@ -50,8 +50,9 @@ class ChatNode(private val printMsg: OnMessage) {
     fun send(message: String) {
         peers.values.forEach { it.controller.send(message) }
 
-        if (message.startsWith("alias "))
+        if (message.startsWith("alias ")) {
             currentAlias = message.substring(6).trim()
+        }
     } // send
 
     fun stop() {
@@ -83,8 +84,9 @@ class ChatNode(private val printMsg: OnMessage) {
         if (
             info.peerId == chatHost.peerId ||
             knownNodes.contains(info.peerId)
-        )
+        ) {
             return
+        }
 
         knownNodes.add(info.peerId)
 
@@ -126,10 +128,11 @@ class ChatNode(private val printMsg: OnMessage) {
                 .filterIsInstance<Inet4Address>()
                 .filter { it.isSiteLocalAddress }
                 .sortedBy { it.hostAddress }
-            return if (addresses.isNotEmpty())
+            return if (addresses.isNotEmpty()) {
                 addresses[0]
-            else
+            } else {
                 InetAddress.getLoopbackAddress()
+            }
         }
     }
 } // class ChatNode
diff --git a/examples/cli-chatter/src/main/kotlin/io/libp2p/example/chat/Chatter.kt b/examples/cli-chatter/src/main/kotlin/io/libp2p/example/chat/Chatter.kt
@@ -17,8 +17,9 @@ fun main() {
         print(">> ")
         message = readLine()?.trim()
 
-        if (message == null || message.isEmpty())
+        if (message == null || message.isEmpty()) {
             continue
+        }
 
         node.send(message)
     } while ("bye" != message)

diff --git a/examples/pinger/src/main/java/io/libp2p/example/ping/Pinger.java b/examples/pinger/src/main/java/io/libp2p/example/ping/Pinger.java
@@ -5,18 +5,13 @@
 import io.libp2p.core.multiformats.Multiaddr;
 import io.libp2p.protocol.Ping;
 import io.libp2p.protocol.PingController;
-
 import java.util.concurrent.ExecutionException;
 
 public class Pinger {
-  public static void main(String[] args)
-      throws ExecutionException, InterruptedException {
+  public static void main(String[] args) throws ExecutionException, InterruptedException {
     // Create a libp2p node and configure it
     // to accept TCP connections on a random port
-    Host node = new HostBuilder()
-        .protocol(new Ping())
-        .listen("/ip4/127.0.0.1/tcp/0")
-        .build();
+    Host node = new HostBuilder().protocol(new Ping()).listen("/ip4/127.0.0.1/tcp/0").build();
 
     // start listening
     node.start().get();
@@ -26,10 +21,7 @@ public static void main(String[] args)
 
     if (args.length > 0) {
       Multiaddr address = Multiaddr.fromString(args[0]);
-      PingController pinger = new Ping().dial(
-          node,
-          address
-      ).getController().get();
+      PingController pinger = new Ping().dial(node, address).getController().get();
 
       System.out.println("Sending 5 ping messages to " + address.toString());
       for (int i = 1; i <= 5; ++i) {

diff --git a/libp2p/build.gradle.kts b/libp2p/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    id("com.google.protobuf").version("0.9.2")
-    id("me.champeau.jmh").version("0.6.8")
+    id("com.google.protobuf").version("0.9.4")
+    id("me.champeau.jmh").version("0.7.1")
 }
 
 // https://docs.gradle.org/current/userguide/java_testing.html#ex-disable-publishing-of-test-fixtures-variants
@@ -17,11 +17,12 @@ dependencies {
 
     api("com.google.protobuf:protobuf-java")
 
+    implementation("com.github.multiformats:java-multibase")
     implementation("tech.pegasys:noise-java")
 
-    implementation("org.bouncycastle:bcprov-jdk15on")
-    implementation("org.bouncycastle:bcpkix-jdk15on")
-    implementation("org.bouncycastle:bctls-jdk15on")
+    implementation("org.bouncycastle:bcprov-jdk18on")
+    implementation("org.bouncycastle:bcpkix-jdk18on")
+    implementation("org.bouncycastle:bctls-jdk18on")
 
     testImplementation(project(":tools:schedulers"))