Skip to content

Commit

Permalink
Merge pull request #22 from LimeChain/merge-upstream-dec-2024
Browse files Browse the repository at this point in the history 
Merge upstream dec 2024
  • Loading branch information
@Zurcusa
Zurcusa authored Dec 20, 2024
2 parents f0b2dde + 2509f28 commit f8a42a4
Show file tree
Hide file tree
Showing 38 changed files with 870 additions and 465 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/local-s3
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Currently implemented properties:
* bloom/[infini filtered](https://www.rasmuspagh.net/papers/infinifilter.pdf) blockstore
* connect bitswap to kademlia for discovery, with a faster version with supplied peerids
* configurable cid publishing function
* mDNS peer discovery
* Android compatibility
* example serverless chat app using p2p http proxy for Android
* interop tests with other implementations - https://github.com/libp2p/test-plans/
Expand All @@ -37,7 +38,6 @@ In the future we will add:
* circuit-relay
* dcutr (direct connection upgrade through relay)
* AutoRelay
* mDNS peer discovery
* example iOS chat app
* QUIC transport (and encryption and multiplexing)

Expand Down
103 changes: 45 additions & 58 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.github.peergos</groupId>
<artifactId>nabu</artifactId>
<version>v0.7.9</version>
<version>v0.8.0</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -16,7 +16,7 @@
<version.hamcrest>2.2</version.hamcrest>
<version.multiaddr>v1.4.12</version.multiaddr>
<version.kubo-http>v1.4.4</version.kubo-http>
<kotlin.version>1.9.10</kotlin.version>
<kotlin.version>2.1.0</kotlin.version>
</properties>

<repositories>
Expand All @@ -40,96 +40,83 @@

<build>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.6</version>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>

<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>

<executions>
<execution>
<id>unpack-dependencies</id>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>unpack-dependencies</goal>
<goal>single</goal>
</goals>
<configuration>
<excludeScope>system</excludeScope>
<excludes>META-INF/*.SF,META-INF/*.DSA,META-INF/*.RSA</excludes>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<sourceDirs>
<source>src/main/java</source>
<source>target/generated-sources/annotations</source>
</sourceDirs>
</configuration>
</execution>
<execution>
<id>testCompile</id>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
<goal>test-compile</goal>
</goals>
</execution>
</executions>
<configuration>
<jvmTarget>${maven.compiler.target}</jvmTarget>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>

<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>

<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>single</goal>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<phase>package</phase>
<id>testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>shade</goal>
<goal>testCompile</goal>
</goals>
<configuration>
<minimizeJar>false</minimizeJar>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
<execution>
<id>default-compile</id>
<phase>none</phase>
</execution>
<execution>
<id>default-testCompile</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
Expand All @@ -139,7 +126,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
Expand All @@ -162,7 +149,7 @@
<dependency>
<groupId>com.github.peergos</groupId>
<artifactId>jvm-libp2p</artifactId>
<version>0.16.6</version>
<version>0.18.0-ipv6-mdns-wildcard</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down
Loading

0 comments on commit f8a42a4

Please sign in to comment.