diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml deleted file mode 100644 index 49cd4ef..0000000 --- a/.github/workflows/ant.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Java CI - -on: [push] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 11 - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 11 - - name: Build with Ant - run: ant -noinput -buildfile build.xml dist - - name: Run tests - timeout-minutes: 10 - run: ant -noinput -buildfile build.xml test diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..2793135 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,21 @@ +name: Java CI + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 11 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 11 + - name: Build with Maven + run: mvn -B test-compile + - name: Run tests with Maven + timeout-minutes: 10 + run: mvn -B test diff --git a/README.md b/README.md index e949099..e4fdade 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,7 @@ This is the [cid](https://github.com/ipld/cid) implementation in Java. - [Usage](#usage) - [Dependency](#dependency) - [Testing](#testing) - - [Ant](#ant) - - [Maven](#maven) - [Building](#building) - - [Ant](#ant-1) - - [Maven](#maven-1) - [Releasing](#releasing) - [Maintainers](#maintainers) - [Contribute](#contribute) @@ -30,14 +26,14 @@ Simply clone this repo. ## Usage -``` +```java Cid cid = Cid.decode("zdpuAyvkgEDQm9TenwGkd5eNaosSxjgEYd8QatfPetgB1CdEZ"); ``` ## Dependency You can use this project by building the JAR file as specified below, or by using [JitPack](https://jitpack.io/#ipld/java-cid/) (also supporting Gradle, SBT, etc). for Maven, you can add the follwing sections to your POM.XML: -``` +```xml jitpack.io @@ -56,22 +52,15 @@ for Maven, you can add the follwing sections to your POM.XML: ## Testing -### Ant -`ant test` - -### Maven `mvn test` ## Building -### Ant -`ant dist` will build a JAR file in the `./dist` suitable for manual inclusion in a project. Dependent libraries are included in `./dist/lib`. - -### Maven `mvn package` will build a JAR file with Maven dependency information. ## Releasing -The version number is specified in `build.xml` and `pom.xml` and must be changed in both places in order to be accurately reflected in the JAR file manifest. A git tag must be added in the format "vx.x.x" for JitPack to work. + +The version number is specified in the `pom.xml` file and must be changed in order to be accurately reflected in the JAR file manifest. A git tag must be added in the format "vx.x.x" for JitPack to work. ## Maintainers diff --git a/build.xml b/build.xml deleted file mode 100644 index 2c04065..0000000 --- a/build.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - Java Content ID - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/hamcrest-2.2.jar b/lib/hamcrest-2.2.jar deleted file mode 100644 index 7106578..0000000 Binary files a/lib/hamcrest-2.2.jar and /dev/null differ diff --git a/lib/junit-4.13.2.jar b/lib/junit-4.13.2.jar deleted file mode 100644 index 6da55d8..0000000 Binary files a/lib/junit-4.13.2.jar and /dev/null differ diff --git a/lib/multibase.jar b/lib/multibase.jar deleted file mode 100644 index 1916839..0000000 Binary files a/lib/multibase.jar and /dev/null differ diff --git a/lib/multihash.jar b/lib/multihash.jar deleted file mode 100644 index e5dd18a..0000000 Binary files a/lib/multihash.jar and /dev/null differ