Skip to content

Commit 4860c5e

Browse files
committed
use internal annotation
1 parent 8f0044f commit 4860c5e

File tree

5 files changed

+22
-12
lines changed

5 files changed

+22
-12
lines changed

pom.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,9 @@
245245
<artifactId>gummy-bears-api-26</artifactId>
246246
<version>0.12.0</version>
247247
</signature>
248+
<annotations>
249+
<annotation>org.sqlite.util.AndroidSignatureIgnore</annotation>
250+
</annotations>
248251
</configuration>
249252
</plugin>
250253
</plugins>
@@ -501,12 +504,6 @@
501504
<version>1.2.13</version>
502505
<scope>test</scope>
503506
</dependency>
504-
<dependency>
505-
<groupId>org.codehaus.mojo</groupId>
506-
<artifactId>animal-sniffer-annotations</artifactId>
507-
<version>1.27</version>
508-
<optional>true</optional>
509-
</dependency>
510507
</dependencies>
511508
<dependencyManagement>
512509
<dependencies>

src/main/java/org/sqlite/jdbc3/JDBC3PreparedStatement.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import java.sql.Timestamp;
2323
import java.sql.Types;
2424
import java.util.Calendar;
25-
import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
2625
import org.sqlite.SQLiteConnection;
2726
import org.sqlite.core.CorePreparedStatement;
2827
import org.sqlite.core.DB;
28+
import org.sqlite.util.AndroidSignatureIgnore;
2929

3030
public abstract class JDBC3PreparedStatement extends CorePreparedStatement {
3131

@@ -170,7 +170,7 @@ public String getParameterClassName(int param) throws SQLException {
170170
}
171171

172172
/** @see java.sql.ParameterMetaData#getParameterTypeName(int) */
173-
@IgnoreJRERequirement
173+
@AndroidSignatureIgnore
174174
public String getParameterTypeName(int pos) throws SQLException {
175175
checkIndex(pos);
176176
return JDBCType.valueOf(getParameterType(pos)).getName();
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package org.sqlite.util;
2+
3+
import java.lang.annotation.ElementType;
4+
import java.lang.annotation.Retention;
5+
import java.lang.annotation.RetentionPolicy;
6+
import java.lang.annotation.Target;
7+
8+
@Retention(RetentionPolicy.CLASS)
9+
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.TYPE, ElementType.FIELD})
10+
public @interface AndroidSignatureIgnore {}

src/main/java9/module-info.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
requires transitive java.sql;
55
requires transitive java.sql.rowset;
66
requires static org.graalvm.nativeimage;
7-
requires animal.sniffer.annotations;
87

98
exports org.sqlite;
109
exports org.sqlite.core;

src/main/java9/org/sqlite/nativeimage/SqliteJdbcFeature.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
package org.sqlite.nativeimage;
22

3-
import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
43
import org.graalvm.nativeimage.hosted.Feature;
54
import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
65
import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
76
import org.graalvm.nativeimage.hosted.RuntimeResourceAccess;
8-
import org.sqlite.*;
7+
import org.sqlite.BusyHandler;
8+
import org.sqlite.Collation;
9+
import org.sqlite.Function;
10+
import org.sqlite.ProgressHandler;
11+
import org.sqlite.SQLiteJDBCLoader;
912
import org.sqlite.core.DB;
1013
import org.sqlite.core.NativeDB;
1114
import org.sqlite.jdbc3.JDBC3DatabaseMetaData;
15+
import org.sqlite.util.AndroidSignatureIgnore;
1216
import org.sqlite.util.LibraryLoaderUtil;
1317
import org.sqlite.util.OSInfo;
1418
import org.sqlite.util.ProcessRunner;
@@ -22,7 +26,7 @@
2226
import java.nio.file.Paths;
2327
import java.nio.file.StandardCopyOption;
2428

25-
@IgnoreJRERequirement
29+
@AndroidSignatureIgnore
2630
public class SqliteJdbcFeature implements Feature {
2731

2832
@Override

0 commit comments

Comments
 (0)