Skip to content

Commit

Permalink
next version
Browse files Browse the repository at this point in the history
  • Loading branch information
jgpc42 committed Oct 22, 2023
1 parent a76a59e commit f2f2d0a
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-18.04, ubuntu-20.04]
jdk: [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18]
jdk: [8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21]

name: Test on ${{ matrix.os }} with JDK ${{ matrix.jdk }}

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.5.5-SNAPSHOT (20XX-XX-XX)

* Upgrade to [ASM 9.6][asm]

## 0.5.4 (2022-04-14)

* BUGFIX: default `iface` value for method instructions should be false *except* for `invokeinterface` ([#12][issue12])
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</dependency>
```

JDK versions 8 to 18 and Clojure versions 1.7 to 1.11 are currently [tested against][ci].
JDK versions 8 to 21 and Clojure versions 1.7 to 1.11 are currently [tested against][ci].
</details>

### What is it?
Expand Down Expand Up @@ -77,7 +77,7 @@ Now to write the bytecode.
(def result (insn/visit class-data))
```

The `result` is a map containing the generated classes' packaged-prefixed `:name` and `:bytes`, the latter being a byte array. This information is all you need to give to a ClassLoader to define your class.
The `result` is a map containing the generated class's packaged-prefixed `:name` and `:bytes`, the latter being a byte array. This information is all you need to give to a ClassLoader to define your class.

For convenience, we can use `insn.core/define` to define the class for us.

Expand Down
2 changes: 1 addition & 1 deletion deps.edn
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{:deps
{org.ow2.asm/asm {:mvn/version "9.3"}}}
{org.ow2.asm/asm {:mvn/version "9.6"}}}
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:deps (mapv #(vector (% 0) (:mvn/version (% 1))))
(into '[[org.clojure/clojure "1.8.0"]])))

(defproject insn "0.5.4"
(defproject insn "0.5.5-SNAPSHOT"
:description "Functional JVM bytecode generation for Clojure."
:url "https://github.com/jgpc42/insn"
:license {:name "Eclipse Public License"
Expand Down
6 changes: 3 additions & 3 deletions src/insn/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

(defn visit
"Generate the class bytecode from the provided type map. Returns a map
of the classes' :name and :bytes. Options:
of the class's :name and :bytes. Options:
:name of the class. Optional, but see below.
Expand Down Expand Up @@ -139,7 +139,7 @@
a map of {parameter-index annotations}.
If the class name is not package prefixed, the current namespace is
used as the resulting classes' package. If a name is not given, a
used as the resulting class's package. If a name is not given, a
generated (gensym) class name is used, qualified by the current
namespace.
Expand Down Expand Up @@ -312,7 +312,7 @@
(.newInstance ^Constructor ctor (object-array args)))))

(defn write
"Takes a map specifying a classes' :name and :bytes. Writes the class
"Takes a map specifying a class's :name and :bytes. Writes the class
bytes to a .class file. The file's directory is taken from its
package, its filename from its name, rooted at `root`.
Expand Down
5 changes: 4 additions & 1 deletion src/insn/util.clj
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,10 @@
16 (get-opcode "V16")
17 (get-opcode "V17")
18 (get-opcode "V18")
19 (get-opcode "V19")})
19 (get-opcode "V19")
20 (get-opcode "V20")
21 (get-opcode "V21")
22 (get-opcode "V22")})

(defmacro ^:no-doc check-valid
"Get the value at `k` in map `m` or throw exception."
Expand Down

0 comments on commit f2f2d0a

Please sign in to comment.