Skip to content

Commit b1b02a5

Browse files
ibauersachsibauersachs
committed
Fix Portaudio linkage, update dependencies
1 parent 00e6276 commit b1b02a5

File tree

3 files changed

+36
-30
lines changed

3 files changed

+36
-30
lines changed

‎.github/workflows/maven-and-native.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ jobs:
275275
git config --global user.name "Jitsi GitHub Action"
276276
cd $Env:GITHUB_WORKSPACE/src/native/
277277
$java_home = "${{ steps.install_java.outputs.path }}".Replace("\\", "/")
278-
cmake -B cmake-build-${{ matrix.arch.actions }} -A ${{ matrix.arch.cmake }} -DJAVA_HOME=$java_home
278+
cmake -B cmake-build-${{ matrix.arch.actions }} -DVCPKG_TARGET_TRIPLET=${{ matrix.arch.cmake }}-windows-static -A ${{ matrix.arch.cmake }} -DJAVA_HOME=$java_home
279279
cmake --build cmake-build-${{ matrix.arch.actions }} --config Release --target install --parallel
280280
281281
- name: Gather logs on failure

‎pom.xml‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>net.java.dev.jna</groupId>
7171
<artifactId>jna</artifactId>
72-
<version>5.11.0</version>
72+
<version>5.13.0</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>org.bouncycastle</groupId>
@@ -94,7 +94,7 @@
9494
<dependency>
9595
<groupId>${project.groupId}</groupId>
9696
<artifactId>jitsi-utils</artifactId>
97-
<version>1.0-114-g43815ed</version>
97+
<version>1.0-126-g02b0c86</version>
9898
</dependency>
9999
<dependency>
100100
<groupId>${project.groupId}</groupId>
@@ -109,7 +109,7 @@
109109
<dependency>
110110
<groupId>${project.groupId}</groupId>
111111
<artifactId>jitsi-lgpl-dependencies</artifactId>
112-
<version>1.2-21-gc4508d5</version>
112+
<version> 1.2-23-g7b49874</version>
113113
<scope>provided</scope>
114114
<optional>true</optional>
115115
</dependency>
@@ -132,21 +132,21 @@
132132
<dependency>
133133
<groupId>org.jetbrains</groupId>
134134
<artifactId>annotations</artifactId>
135-
<version>23.0.0</version>
135+
<version>24.0.1</version>
136136
<scope>provided</scope>
137137
</dependency>
138138

139139
<!-- test -->
140140
<dependency>
141141
<groupId>org.junit.jupiter</groupId>
142142
<artifactId>junit-jupiter-engine</artifactId>
143-
<version>5.8.2</version>
143+
<version>5.9.3</version>
144144
<scope>test</scope>
145145
</dependency>
146146
<dependency>
147147
<groupId>org.mockito</groupId>
148148
<artifactId>mockito-core</artifactId>
149-
<version>4.5.1</version>
149+
<version>5.4.0</version>
150150
<scope>test</scope>
151151
</dependency>
152152
<dependency>
@@ -159,10 +159,25 @@
159159

160160
<build>
161161
<plugins>
162+
<plugin>
163+
<groupId>org.codehaus.mojo</groupId>
164+
<artifactId>versions-maven-plugin</artifactId>
165+
<version>2.16.0</version>
166+
<configuration>
167+
<ruleSet>
168+
<ignoreVersions>
169+
<ignoreVersion>
170+
<type>regex</type>
171+
<version>.+-(alpha|beta|M|RC).*</version>
172+
</ignoreVersion>
173+
</ignoreVersions>
174+
</ruleSet>
175+
</configuration>
176+
</plugin>
162177
<plugin>
163178
<groupId>org.apache.felix</groupId>
164179
<artifactId>maven-bundle-plugin</artifactId>
165-
<version>5.1.6</version>
180+
<version>5.1.9</version>
166181
<extensions>true</extensions>
167182
<configuration>
168183
<excludeDependencies>jitsi-lgpl-dependencies</excludeDependencies>
@@ -198,7 +213,7 @@
198213
<plugin>
199214
<groupId>org.apache.maven.plugins</groupId>
200215
<artifactId>maven-compiler-plugin</artifactId>
201-
<version>3.10.1</version>
216+
<version>3.11.0</version>
202217
<configuration>
203218
<release>11</release>
204219
<compilerArgs>
@@ -210,12 +225,12 @@
210225
</plugin>
211226
<plugin>
212227
<artifactId>maven-surefire-plugin</artifactId>
213-
<version>2.22.2</version>
228+
<version>3.1.2</version>
214229
</plugin>
215230
<plugin>
216231
<groupId>org.apache.maven.plugins</groupId>
217232
<artifactId>maven-javadoc-plugin</artifactId>
218-
<version>3.4.0</version>
233+
<version>3.5.0</version>
219234
<configuration>
220235
<doclint>-missing</doclint>
221236
<source>11</source>
@@ -224,25 +239,25 @@
224239
<plugin>
225240
<groupId>org.apache.maven.plugins</groupId>
226241
<artifactId>maven-source-plugin</artifactId>
227-
<version>3.2.1</version>
242+
<version>3.3.0</version>
228243
<configuration>
229244
<excludeResources>true</excludeResources>
230245
</configuration>
231246
</plugin>
232247
<plugin>
233248
<groupId>org.apache.maven.plugins</groupId>
234249
<artifactId>maven-resources-plugin</artifactId>
235-
<version>3.2.0</version>
250+
<version>3.3.1</version>
236251
</plugin>
237252
<plugin>
238253
<groupId>org.apache.maven.plugins</groupId>
239254
<artifactId>maven-install-plugin</artifactId>
240-
<version>3.0.0-M1</version>
255+
<version>3.1.1</version>
241256
</plugin>
242257
<plugin>
243258
<groupId>org.apache.maven.plugins</groupId>
244259
<artifactId>maven-deploy-plugin</artifactId>
245-
<version>3.0.0-M2</version>
260+
<version>3.1.1</version>
246261
</plugin>
247262
<plugin>
248263
<groupId>org.sonatype.plugins</groupId>

‎src/main/java/org/jitsi/impl/libjitsi/LibJitsiImpl.java‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,10 @@ private static <T> T initializeService(String className, Class<T> clazz)
177177
if (!suppressClassNotFoundException)
178178
exception = cnfe;
179179
}
180-
catch (ExceptionInInitializerError eiie)
180+
catch (LinkageError eiie)
181181
{
182182
exception = eiie;
183183
}
184-
catch (LinkageError le)
185-
{
186-
exception = le;
187-
}
188184

189185
T service = null;
190186

@@ -193,21 +189,16 @@ private static <T> T initializeService(String className, Class<T> clazz)
193189
try
194190
{
195191
@SuppressWarnings("unchecked")
196-
T t = (T) implClass.newInstance();
192+
T t = (T) implClass.getConstructor().newInstance();
197193

198194
service = t;
199195
}
200-
catch (Throwable t)
196+
catch (Exception e)
201197
{
202-
if (t instanceof ThreadDeath)
203-
{
204-
throw (ThreadDeath) t;
205-
}
206-
else
198+
exception = e;
199+
if (e instanceof InterruptedException)
207200
{
208-
exception = t;
209-
if (t instanceof InterruptedException)
210-
Thread.currentThread().interrupt();
201+
Thread.currentThread().interrupt();
211202
}
212203
}
213204
}

0 commit comments

Comments
 (0)