Skip to content

Commit 9b965e2

Browse files
grahambrown11grahambrown11
committed
change example inclusion and other example updates
1 parent 28d6d81 commit 9b965e2

File tree

24 files changed

+465
-273
lines changed

24 files changed

+465
-273
lines changed

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,10 @@ oss.yaml
3232

3333
# vagrant state folder
3434
.vagrant
35+
36+
# local build examples
37+
.inc-examples
38+
# exclude keys
39+
examples/vagrant/asterisk/keys/*.key
40+
examples/vagrant/asterisk/keys/*.crt
41+
examples/vagrant/asterisk/keys/*.csr

‎examples/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Docker image to use with Vagrant
22
# Aims to be as similar to normal Vagrant usage as possible
3-
# Adds Puppet, SSH daemon, Systemd
3+
# Adds SSH daemon, Systemd
44
# Adapted from https://github.com/BashtonLtd/docker-vagrant-images/blob/master/ubuntu1404/Dockerfile
55

6-
FROM ubuntu:focal
6+
FROM ubuntu:noble
77
ENV container docker
88
RUN apt update && apt -y upgrade
99

1010
# Install system dependencies, you may not need all of these
11-
RUN apt install -y --no-install-recommends ssh sudo libffi-dev systemd openssh-client nano
11+
RUN apt install -y --no-install-recommends ssh sudo libffi-dev systemd openssh-client nano wget curl less
1212

1313
# Add vagrant user and key for SSH
1414
RUN useradd --create-home -s /bin/bash vagrant

‎examples/Vagrantfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
if not ENV["NET_BRIDGE"] then ENV["NET_BRIDGE"] = "off" end
99

1010
Vagrant.configure("2") do |config|
11-
config.vm.box = "ubuntu/focal64"
11+
config.vm.box = "cloud-image/ubuntu-24.04"
1212
config.vm.synced_folder "./vagrant", "/vagrant"
1313
config.vm.provider "virtualbox" do |v, override|
1414
v.memory = 1024

‎examples/build.gradle‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
11
plugins {
2-
id 'java'
2+
id "java"
33
}
44

55
repositories {
66
mavenCentral()
77
}
88

99
dependencies {
10-
implementation 'ch.loway.oss.ari4java:ari4java:+'
11-
implementation 'ch.qos.logback:logback-classic:1.2.10'
12-
implementation 'io.netty:netty-all:4.1.72.Final'
10+
if (file("../.inc-examples").exists()) {
11+
implementation project(":")
12+
} else {
13+
implementation "ch.loway.oss.ari4java:ari4java:+"
14+
}
15+
implementation "ch.qos.logback:logback-classic:1.5.25"
16+
implementation "io.netty:netty-all:4.2.9.Final"
1317
}
1418

1519
java {
16-
sourceCompatibility = JavaVersion.VERSION_1_8
17-
targetCompatibility = JavaVersion.VERSION_1_8
20+
sourceCompatibility = JavaVersion.VERSION_17
21+
targetCompatibility = JavaVersion.VERSION_17
1822
}
1923

2024
task runWeaselsExample(type: JavaExec) {
2125
dependsOn build
2226
classpath = sourceSets.main.runtimeClasspath
23-
mainClass = 'ch.loway.oss.ari4java.examples.Weasels'
27+
mainClass = "ch.loway.oss.ari4java.examples.Weasels"
2428
}
2529

2630
task runComprehensiveExample(type: JavaExec) {
2731
dependsOn build
2832
classpath = sourceSets.main.runtimeClasspath
29-
mainClass = 'ch.loway.oss.ari4java.examples.comprehensive.Boot'
33+
mainClass = "ch.loway.oss.ari4java.examples.comprehensive.Boot"
3034
}

‎examples/gradle/wrapper/gradle-wrapper.jar‎

333 Bytes
Binary file not shown.

‎examples/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)