Skip to content

Commit c5956c6

Browse files
authored
Merge pull request #56 from johnwalker/macbuilds
Add support for running tests on OSX and Windows
2 parents ed0112a + 33565ce commit c5956c6

File tree

2 files changed

+29
-17
lines changed

2 files changed

+29
-17
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
cleanup.sh
22
release.sh
33
target
4+
.idea/
5+
*.iml

pom.xml

+27-17
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,26 @@
9090
</dependency>
9191

9292
<dependency>
93-
<groupId>com.almworks.sqlite4java</groupId>
94-
<artifactId>sqlite4java</artifactId>
95-
<version>${sqlite4java.version}</version>
96-
<scope>test</scope>
93+
<groupId>com.almworks.sqlite4java</groupId>
94+
<artifactId>sqlite4java</artifactId>
95+
<version>${sqlite4java.version}</version>
96+
<scope>test</scope>
97+
</dependency>
98+
99+
<dependency>
100+
<groupId>com.almworks.sqlite4java</groupId>
101+
<artifactId>libsqlite4java-osx</artifactId>
102+
<version>${sqlite4java.version}</version>
103+
<type>dylib</type>
104+
<scope>test</scope>
105+
</dependency>
106+
107+
<dependency>
108+
<groupId>com.almworks.sqlite4java</groupId>
109+
<artifactId>sqlite4java-win32-x64</artifactId>
110+
<version>${sqlite4java.version}</version>
111+
<type>dll</type>
112+
<scope>test</scope>
97113
</dependency>
98114

99115
<dependency>
@@ -143,21 +159,14 @@
143159
<executions>
144160
<execution>
145161
<id>copy</id>
146-
<phase>compile</phase>
162+
<phase>test-compile</phase>
147163
<goals>
148-
<goal>copy</goal>
164+
<goal>copy-dependencies</goal>
149165
</goals>
150166
<configuration>
151-
<artifactItems>
152-
<artifactItem>
153-
<groupId>com.almworks.sqlite4java</groupId>
154-
<artifactId>libsqlite4java-linux-amd64</artifactId>
155-
<version>${sqlite4java.version}</version>
156-
<type>so</type>
157-
<overWrite>true</overWrite>
158-
<outputDirectory>${project.build.directory}/test-lib</outputDirectory>
159-
</artifactItem>
160-
</artifactItems>
167+
<includeScope>test</includeScope>
168+
<includeTypes>so,dll,dylib</includeTypes>
169+
<outputDirectory>${project.build.directory}/test-lib</outputDirectory>
161170
</configuration>
162171
</execution>
163172
</executions>
@@ -166,8 +175,9 @@
166175
<plugin>
167176
<groupId>org.apache.maven.plugins</groupId>
168177
<artifactId>maven-surefire-plugin</artifactId>
169-
<version>2.19.1</version>
178+
<version>2.22.1</version>
170179
<configuration>
180+
<useSystemClassLoader>false</useSystemClassLoader>
171181
<includes>
172182
<include>**/Test*.java</include>
173183
<include>**/*Test.java</include>

0 commit comments

Comments
 (0)