Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sorma2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ It is based on the wonderful https://github.com/maskarade/Android-Orma by [FUJI
<br>
This is a rewrite in pure java, to generate most stuff you need and then add it to your project
either as a ```.jar file``` or as ```java source```.<br>
You still need to add ```sqlite-jdbc-3.53.2.0.jar``` to your project to use it.<br>
You still need to add ```sqlite-jdbc-3.53.2.1.jar``` to your project to use it.<br>
<br><br>
~~sadly [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) project decided that it needs ```slf4j-api jar``` (for no good reason).~~
this was solved by: https://github.com/xerial/sqlite-jdbc/pull/1178
Expand Down Expand Up @@ -75,7 +75,7 @@ public class Person

now create the Java sources with the Java SORMA2 Generator. <b>you need at least java 17</b>.<br>
```bash
java -classpath ".:sqlite-jdbc-3.53.2.0.jar:sorma2.jar" \
java -classpath ".:sqlite-jdbc-3.53.2.1.jar:sorma2.jar" \
com/zoffcc/applications/sorm/Generator "gen"
```

Expand All @@ -100,7 +100,7 @@ Android project you will need `com.github.zoff99:pkgs_zoffccAndroidJDBC` from [j
add this dependency to your `build.gradle` file

```
implementation 'com.github.zoff99:pkgs_zoffccAndroidJDBC:1.0.27'
implementation 'com.github.zoff99:pkgs_zoffccAndroidJDBC:1.0.29'
```


Expand All @@ -120,7 +120,7 @@ see: https://github.com/zoff99/sorma2/tree/master/test

<img src="https://github.com/zoff99/sorma2/releases/download/nightly/java8_console_screen.png" width="70%">

Use the `sorma_generated.jar` (that is generated in the `gen` directory) and `sqlite-jdbc-3.53.2.0.jar` for the Java project.<br>
Use the `sorma_generated.jar` (that is generated in the `gen` directory) and `sqlite-jdbc-3.53.2.1.jar` for the Java project.<br>
Check `TestSorma.java` for an Example usage.
<br>

Expand Down
6 changes: 3 additions & 3 deletions sorma2/do_actual_run_java_8.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

cd gen/
javac \
-cp "sqlite-jdbc-3.53.2.0.jar" \
-cp "sqlite-jdbc-3.53.2.1.jar" \
com/zoffcc/applications/sorm/*.java && \
jar cf sorma_generated.jar com/zoffcc/applications/sorm/*.class && \
cp sorma_generated.jar ../test/ && \
Expand All @@ -11,11 +11,11 @@ cd ../ || exit 1
# use generated custom jar
cd test/
javac \
-classpath ".:sqlite-jdbc-3.53.2.0.jar:sorma_generated.jar" \
-classpath ".:sqlite-jdbc-3.53.2.1.jar:sorma_generated.jar" \
org/example/TestSorma.java || exit 1

rm -f main.db

java \
-classpath ".:sqlite-jdbc-3.53.2.0.jar:sorma_generated.jar" \
-classpath ".:sqlite-jdbc-3.53.2.1.jar:sorma_generated.jar" \
org/example/TestSorma || exit 1
2 changes: 1 addition & 1 deletion sorma2/do_compile_part1_java_17_needed.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/bash

javac \
-cp "sqlite-jdbc-3.53.2.0.jar" \
-cp "sqlite-jdbc-3.53.2.1.jar" \
com/zoffcc/applications/sorm/Column.java \
com/zoffcc/applications/sorm/Index.java \
com/zoffcc/applications/sorm/Log.java \
Expand Down
2 changes: 1 addition & 1 deletion sorma2/do_compile_part2_java_17_needed.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! /bin/bash

java \
-classpath ".:sqlite-jdbc-3.53.2.0.jar:sorma2.jar" \
-classpath ".:sqlite-jdbc-3.53.2.1.jar:sorma2.jar" \
com/zoffcc/applications/sorm/Generator "gen" || exit 1
Binary file not shown.