diff options
| author | stephan <stephan@noemail.net> | 2023-08-28 05:39:05 +0000 |
|---|---|---|
| committer | stephan <stephan@noemail.net> | 2023-08-28 05:39:05 +0000 |
| commit | b041f8ffdd8bcde211d366b73a12086f1ecc32d0 (patch) | |
| tree | cb5491a94140fb29c392b18e50a8d907918ca5ad /ext | |
| parent | 56d3b213177c1f39f0bab617e63b937fad2df074 (diff) | |
| download | sqlite-b041f8ffdd8bcde211d366b73a12086f1ecc32d0.tar.gz sqlite-b041f8ffdd8bcde211d366b73a12086f1ecc32d0.zip | |
Move the JNI annotations into the annotation subpackage.
FossilOrigin-Name: e4dedf90a92a069daef967dfe975469bf8ec7883c44c95e73345d4eded48e996
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/jni/GNUmakefile | 4 | ||||
| -rw-r--r-- | ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java | 1 | ||||
| -rw-r--r-- | ext/jni/src/org/sqlite/jni/SQLite3Jni.java | 1 | ||||
| -rw-r--r-- | ext/jni/src/org/sqlite/jni/annotation/NotNull.java (renamed from ext/jni/src/org/sqlite/jni/NotNull.java) | 0 | ||||
| -rw-r--r-- | ext/jni/src/org/sqlite/jni/annotation/Nullable.java (renamed from ext/jni/src/org/sqlite/jni/Nullable.java) | 0 |
5 files changed, 4 insertions, 2 deletions
diff --git a/ext/jni/GNUmakefile b/ext/jni/GNUmakefile index 32bd7b4b5..05f05679c 100644 --- a/ext/jni/GNUmakefile +++ b/ext/jni/GNUmakefile @@ -59,6 +59,8 @@ $(bin.version-info): $(dir.tool)/version-info.c $(sqlite3.h) $(dir.top)/Makefile # Be explicit about which Java files to compile so that we can work on # in-progress files without requiring them to be in a compilable statae. JAVA_FILES.main := $(patsubst %,$(dir.src.jni)/%,\ + annotation/NotNull.java \ + annotation/Nullable.java \ AggregateFunction.java \ AuthorizerCallback.java \ AutoExtensionCallback.java \ @@ -68,8 +70,6 @@ JAVA_FILES.main := $(patsubst %,$(dir.src.jni)/%,\ CommitHookCallback.java \ ConfigSqllogCallback.java \ NativePointerHolder.java \ - NotNull.java \ - Nullable.java \ OutputPointer.java \ PreupdateHookCallback.java \ ProgressHandlerCallback.java \ diff --git a/ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java b/ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java index 625f8af3a..ab2995f37 100644 --- a/ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java +++ b/ext/jni/src/org/sqlite/jni/Fts5ExtensionApi.java @@ -13,6 +13,7 @@ */ package org.sqlite.jni; import java.nio.charset.StandardCharsets; +import org.sqlite.jni.annotation.*; /** ALMOST COMPLETELY UNTESTED. diff --git a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java index df4657fd2..8777a9abd 100644 --- a/ext/jni/src/org/sqlite/jni/SQLite3Jni.java +++ b/ext/jni/src/org/sqlite/jni/SQLite3Jni.java @@ -18,6 +18,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; +import org.sqlite.jni.annotation.*; /** This class contains the entire C-style sqlite3 JNI API binding, diff --git a/ext/jni/src/org/sqlite/jni/NotNull.java b/ext/jni/src/org/sqlite/jni/annotation/NotNull.java index 831f08451..831f08451 100644 --- a/ext/jni/src/org/sqlite/jni/NotNull.java +++ b/ext/jni/src/org/sqlite/jni/annotation/NotNull.java diff --git a/ext/jni/src/org/sqlite/jni/Nullable.java b/ext/jni/src/org/sqlite/jni/annotation/Nullable.java index 1dbb780d5..1dbb780d5 100644 --- a/ext/jni/src/org/sqlite/jni/Nullable.java +++ b/ext/jni/src/org/sqlite/jni/annotation/Nullable.java |