Skip to content

Commit

Permalink
[all] Release v0.22.0
Browse files Browse the repository at this point in the history
  • Loading branch information
BrunoBonacci committed Jul 18, 2022
1 parent 5754300 commit 571fadb
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion 1config-cli/bin/native-image-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
export BASE=${1:-.}
export PLATFORM=${2}

# using GraalVM CE 20.3.0
# using GraalVM CE 20.3.0 java 11
native-image --report-unsupported-elements-at-runtime \
--no-server \
--no-fallback \
Expand Down
2 changes: 2 additions & 0 deletions 1config-ui/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
(vector "--add-opens" "java.base/java.lang=ALL-UNNAMED" "-server")
(vector "-server"))

:javac-options ["-target" "1.8" "-source" "1.8" ]

:dependencies [[org.clojure/clojure "1.11.1"]
[org.clojure/clojurescript "1.11.60"]
Expand Down Expand Up @@ -44,6 +45,7 @@
[re-frisk "0.5.4.1"]

[org.slf4j/slf4j-log4j12 "1.7.36"]
[org.apache.logging.log4j/log4j-core "2.18.0"]
[com.github.clj-easy/graal-build-time "0.1.4"]]

:min-lein-version "2.7.1"
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## Release: v0.22.0 (2022-07-14)
## Release: v0.22.0 (2022-07-18)

* [NEW] drop dependency from Jsonista and Jackson in favour or cnuernber/charred
* [NEW] add possibility to customise `1config.home` dir via java property (#35)
Expand Down
9 changes: 7 additions & 2 deletions doc/howto-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,17 @@
- build cli packages
```
cd 1config-cli
lein do clean, bin, package
lein do clean, bin, native-config, native
```
- build Linux version of a linux machine
```
cd 1config-cli
lein do clean, uberjar, native
```
- build UI packages
```
cd 1config-ui
lein do clean, bin, package
lein do clean, bin
```
- release to clojars
```
Expand Down
10 changes: 5 additions & 5 deletions doc/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ Quick start guide to install and use 1Config.

``` bash
mkdir -p ~/bin
wget https://github.com/BrunoBonacci/1config/releases/download/0.21.0/1cfg-`uname` -O ~/bin/1cfg
wget https://github.com/BrunoBonacci/1config/releases/download/0.21.0/1cfg-ui-beta -O ~/bin/1cfg-ui-beta
wget https://github.com/BrunoBonacci/1config/releases/download/0.21.0/1cfgX -O ~/bin/1cfgX
wget https://github.com/BrunoBonacci/1config/releases/download/0.22.0/1cfg-`uname` -O ~/bin/1cfg
wget https://github.com/BrunoBonacci/1config/releases/download/0.22.0/1cfg-ui-beta -O ~/bin/1cfg-ui-beta
wget https://github.com/BrunoBonacci/1config/releases/download/0.22.0/1cfgX -O ~/bin/1cfgX
chmod +x ~/bin/1cfg ~/bin/1cfgX ~/bin/1cfg-ui-beta
export PATH=~/bin:$PATH
```
Expand All @@ -27,8 +27,8 @@ export PATH=~/bin:$PATH

- Open a terminal window
- Create installation dir `md %userprofile%\1config\bin`
- Download https://github.com/BrunoBonacci/1config/releases/download/0.21.0/1cfgX and save it in the above folder
- Download https://github.com/BrunoBonacci/1config/releases/download/0.21.0/1cfg-ui-beta and save it in the above folder
- Download https://github.com/BrunoBonacci/1config/releases/download/0.22.0/1cfgX and save it in the above folder
- Download https://github.com/BrunoBonacci/1config/releases/download/0.22.0/1cfg-ui-beta and save it in the above folder
- Rename file into `1cfg.cmd` with `ren %userprofile%\1config\bin\1cfgX %userprofile%\1config\bin\1cfg.cmd`
- Rename file into `1cfg-ui-beta.cmd` with `ren %userprofile%\1config\bin\1cfg-ui-beta %userprofile%\1config\bin\1cfg-ui-beta.cmd`
- Add it to the System path:
Expand Down
4 changes: 2 additions & 2 deletions doc/usage-with-clojure.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ In order to use the library add the dependency to your `project.clj`

``` clojure
;; Leiningen project
[com.brunobonacci/oneconfig "0.21.0"]
[com.brunobonacci/oneconfig "0.22.0"]

;; deps.edn format
{:deps { com.brunobonacci/oneconfig {:mvn/version "0.21.0"} }}
{:deps { com.brunobonacci/oneconfig {:mvn/version "0.22.0"} }}
```

Latest version: [![Clojars Project](https://img.shields.io/clojars/v/com.brunobonacci/oneconfig.svg)](https://clojars.org/com.brunobonacci/oneconfig)
Expand Down
2 changes: 1 addition & 1 deletion doc/usage-with-java.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Then add the dependency
<dependency>
<groupId>com.brunobonacci</groupId>
<artifactId>oneconfig</artifactId>
<version>0.21.0</version>
<version>0.22.0</version>
<classifier>aot</classifier>
</dependency>
```
Expand Down
28 changes: 10 additions & 18 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,28 +63,18 @@ all: clean build test package
release: clean update-version build test package


#
# Checking java version
#
check-ver:
ifneq ($(shell java -version 2>&1 | grep 1.8.0 >/dev/null; printf $$?),0)
- echo "please use JDK 1.8"
- exit 1
endif


#
# Build
#
build: check-ver build-core build-cli build-ui
build: build-core build-cli build-ui
- @printf "#\n# Building 1config Completed!\n#\n"


#
# Build Core
#
core_src = $(shell find 1config-core/src 1config-core/resources 1config-shared/src -type f)
build-core: check-ver 1config-core/target/oneconfig*.jar
build-core: 1config-core/target/oneconfig*.jar
1config-core/target/oneconfig*.jar: $(core_src)
- @printf "#\n# Building 1config-core\n#\n"
- (cd 1config-core; lein do check, midje, install)
Expand All @@ -94,7 +84,7 @@ build-core: check-ver 1config-core/target/oneconfig*.jar
# Build CLI
#
cli_src = $(shell find 1config-cli/src 1config-cli/resources 1config-shared/src -type f)
build-cli: check-ver build-core 1config-cli/target/1cfg
build-cli: build-core 1config-cli/target/1cfg
1config-cli/target/1cfg: $(cli_src)
- @printf "#\n# Building 1config-cli\n#\n"
- (cd 1config-cli; lein do check, bin)
Expand All @@ -105,7 +95,7 @@ build-cli: check-ver build-core 1config-cli/target/1cfg
# Build UI
#
ui_src = $(shell find 1config-ui/src 1config-ui/resources 1config-shared/src -type f)
build-ui: check-ver build-core 1config-ui/target/1cfg-ui-beta
build-ui: build-core 1config-ui/target/1cfg-ui-beta
1config-ui/target/1cfg-ui-beta: $(ui_src)
- @printf "#\n# Building 1config-ui\n#\n"
- (cd 1config-ui; lein do check, bin)
Expand All @@ -122,13 +112,15 @@ test: build-core
#
PACKAGE := 1cfg
PKDIR := /tmp/$(PACKAGE)
TARGETS := 1config-cli/target/1cfg 1config-ui/target/1cfg-ui-beta
package: build $(TARGETS)
.PHONY: package
package:
- rm -fr $(PKDIR)
- mkdir -p $(PKDIR)/hb/bin
- @printf "\n(-) preparing copying artifact\n"
- chmod +x $(TARGETS)
- cp $(TARGETS) $(PKDIR)
- cp 1config-cli/target/1cfg $(PKDIR)/1cfg-Darwin
- cp 1config-cli/target/1cfg-Linux $(PKDIR)/1cfg-Linux
- cp 1config-cli/target/1cfgx $(PKDIR)
- cp 1config-ui/target/1cfg-ui-beta $(PKDIR)
- @printf "\n(-) preparing Homebrew package for Linux\n"
- cp 1config-cli/bin/1cfg $(PKDIR)/hb/bin
- cp 1config-cli/target/1cfg $(PKDIR)/hb/bin/1cfg.jar
Expand Down

0 comments on commit 571fadb

Please sign in to comment.