Merge pull request #469 from jusjoken/master

Changes to support a linux build to run on Java 8

.github/workflows/ci.yml

@@ -10,14 +10,14 @@ jobs:
   build:
 
 #    runs-on: ubuntu-latest
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Oracle JDK 9
+    - name: Set up Oracle JDK 11
       uses: actions/setup-java@v2
       with:
-        java-version: '9'
+        java-version: '11'
         distribution: 'adopt'
         cache: gradle
     - name: Update apt

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Change Log
 
+## Version 9.2.7 (2022-01-03)
+* Update to build process to support build on JDK 11 while supporting Java 8 dockers to run SageTV
 * Added DirecTVTuner DLL for http tuning (Windows)
 
 ## Version 9.2.6 (2021-09-13)

build.gradle

@@ -60,7 +60,7 @@ repositories {
 }
 
 configurations {
-  miniclient.extendsFrom compile
+  miniclient.extendsFrom implementation
 }
 
 // Maybe someday we'll target >1.7 (hopefully)
@@ -69,6 +69,7 @@ sourceCompatibility = 1.7
 
 compileJava {
   options.warnings = false
+  options.compilerArgs.addAll(['--release', '8'])
   //options.incremental = true
   //options.debugOptions.debugLevel = "source,lines,vars"
 }
@@ -125,25 +126,25 @@ sourceSets {
 }
 
 dependencies {
-  testCompile 'org.testng:testng:6.1.1'
-  testCompile "org.mockito:mockito-core:1.9.5"
+  testImplementation 'org.testng:testng:6.1.1'
+  testImplementation "org.mockito:mockito-core:1.9.5"
 
-  compile files(
+  implementation files(
     'third_party/UPnPLib/sbbi-upnplib-1.0.3.jar',
 
     'third_party/Oracle/vecmath.jar',
     'third_party/Lucene/lucene-core-3.6.0.jar',
     'third_party/JCIFS/jcifs-1.1.6.jar',
   )
 
-  compile 'com.apple:AppleJavaExtensions:1.4'
-  compile "org.jogamp.jogl:jogl-all:$jogampVer"
-  compile "org.jogamp.gluegen:gluegen-rt-main:$jogampVer"
+  implementation 'com.apple:AppleJavaExtensions:1.4'
+  implementation "org.jogamp.jogl:jogl-all:$jogampVer"
+  implementation "org.jogamp.gluegen:gluegen-rt-main:$jogampVer"
 
 
   // Miniclient dependencies for compiling
-  miniclientCompile "org.jogamp.gluegen:gluegen-rt-main:$jogampVer"
-  miniclientCompile "org.jogamp.jogl:jogl-all-main:$jogampVer"
+  miniclientImplementation "org.jogamp.gluegen:gluegen-rt-main:$jogampVer"
+  miniclientImplementation "org.jogamp.jogl:jogl-all-main:$jogampVer"
 }
 
 test {
@@ -275,7 +276,7 @@ task(linuxMiniClientRelease) {
       from('build/so/libImageLoader.so')
       from('build/elf/mplayer')
 
-      from(configurations.miniclientRuntime)
+      from(configurations.miniclientRuntimeClasspath)
 
       into(miniclientReleaseDestinationDir)
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip

java/sage/Version.java

@@ -23,7 +23,7 @@ public class Version
 {
   public static final byte MAJOR_VERSION = 9;
   public static final byte MINOR_VERSION = 2;
-  public static final byte MICRO_VERSION = 6;
+  public static final byte MICRO_VERSION = 7;
 
   public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + MICRO_VERSION + "." + SageConstants.BUILD_VERSION;