Skip to content

Commit 34ffe9f

Browse files
committed
upgrade to new tools.build and remove pom-template
1 parent 4eb98e7 commit 34ffe9f

File tree

6 files changed

+13
-19
lines changed

6 files changed

+13
-19
lines changed

.github/workflows/check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
- name: Prepare java
1515
uses: actions/setup-java@v3
1616
with:
1717
distribution: 'corretto'
1818
java-version: '19'
1919
- name: Install clojure tools
20-
uses: DeLaGuardo/setup-clojure@11.0
20+
uses: DeLaGuardo/setup-clojure@12.1
2121
with:
2222
cli: latest
2323
- name: Cache clojure dependencies

builds/build.clj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
(:require [clojure.tools.build.api :as b]))
33

44
(def lib 'org.clojars.rutledgepaulv/piped)
5-
(def version "0.1.8")
5+
(def version "0.1.9")
66
(def class-dir "target/classes")
77
(def basis (b/create-basis {:project "deps.edn"}))
88
(def jar-file (format "target/piped.jar" (name lib) version))
@@ -19,7 +19,10 @@
1919
:version version
2020
:basis basis
2121
:src-dirs ["src"]
22-
:src-pom "builds/pom-template.xml"
22+
:pom-data [[:licenses
23+
[:license
24+
[:name "MIT"]
25+
[:url "https://opensource.org/license/mit/"]]]]
2326
:scm {:tag (str "v" version)
2427
:connection (str "scm:git:[email protected]:rutledgepaulv/" (name lib) ".git")
2528
:url (str "https://github.com/rutledgepaulv/" (name lib))}})

builds/pom-template.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

deps.edn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
:aliases
1111
{:build {:extra-deps {io.github.clojure/tools.build
1212
{:git/url "https://github.com/clojure/tools.build.git"
13-
:sha "32d497f4f1ad07cb1dfa0855ada9e9cf17abff48"}}
13+
:sha "cc1e33d003e2e9507e8e6e899611f56172dacc0a"}}
1414
:extra-paths ["builds"]
1515
:ns-default build}
1616

1717
:test {:extra-paths ["test"]
18-
:extra-deps {org.testcontainers/testcontainers {:mvn/version "1.19.0"}
18+
:extra-deps {org.testcontainers/testcontainers {:mvn/version "1.19.1"}
1919
org.slf4j/slf4j-simple {:mvn/version "2.0.9"}}}
2020

2121
:run-tests {:extra-deps {io.github.cognitect-labs/test-runner

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://travis-ci.com/rutledgepaulv/piped.svg?branch=master)](https://travis-ci.com/rutledgepaulv/piped)
1+
![Build](https://github.com/rutledgepaulv/piped/actions/workflows/check/badge.svg?branch=master)
22
[![Clojars Project](https://img.shields.io/clojars/v/org.clojars.rutledgepaulv/piped.svg)](https://clojars.org/org.clojars.rutledgepaulv/piped)
33

44
<img src="./docs/ready-hans.jpg" title="harmonic labyrinth" width="300" height="300" align="left" padding="5px"/>

release.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
2+
set -e
23

34
clj -X:build clean
45
clj -X:build jar
@@ -16,5 +17,5 @@ op run -- mvn deploy:deploy-file \
1617
-DrepositoryId="clojars" \
1718
-Durl="https://repo.clojars.org"
1819

19-
#git tag "v$version"
20-
#git push origin "refs/tags/v$version"
20+
git tag "v$version"
21+
git push origin "refs/tags/v$version"

0 commit comments

Comments
 (0)