Update to Java 17, sync Android signature settings with FHIR SDK (#1442)

* Update to Java 17, sync Android signature settings with FHIR SDK * Switch to advanced CodeQL * Tweaking source location * Try autobuilding * More tweaking the build
cqframework · Nov 15, 2024 · 935ef51 · 935ef51
1 parent 6af4b68
commit 935ef51
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 10 deletions.
diff --git a/.github/workflows/ codeql.yml b/.github/workflows/ codeql.yml
@@ -0,0 +1,47 @@
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "master" ]
+    paths:
+      - "Src/java/**"
+  pull_request:
+    branches: [ "master" ]
+    paths:
+      - "Src/java/**"
+  schedule:
+    - cron: '36 15 * * 1'
+
+jobs:
+  CodeQLBuild:
+    runs-on: 'ubuntu-latest'
+    permissions:
+      security-events: write
+      packages: read
+      actions: read
+      contents: read
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Setup Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '21'
+        cache: 'gradle'
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: java-kotlin
+        source-root: Src/java
+    - name: Autobuild CodeQL
+      uses: github/codeql-action/autobuild@v3
+      with:
+        working-directory: Src/java
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:java-kotlin"
diff --git a/Src/java/build.gradle.kts b/Src/java/build.gradle.kts
@@ -15,10 +15,6 @@ repositories {
     mavenCentral()
 }
 
-dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-}
-
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
diff --git a/Src/java/buildSrc/build.gradle.kts b/Src/java/buildSrc/build.gradle.kts
@@ -9,11 +9,11 @@ repositories {
 
 dependencies {
     implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.1.0")
-    implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.0")
+    implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.1")
     implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.14")
     implementation("com.diffplug.spotless:spotless-plugin-gradle:6.23.3")
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
diff --git a/Src/java/buildSrc/src/main/kotlin/cql.java-conventions.gradle.kts b/Src/java/buildSrc/src/main/kotlin/cql.java-conventions.gradle.kts
@@ -11,7 +11,7 @@ java {
     withJavadocJar()
     withSourcesJar()
     toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 

diff --git a/Src/java/buildSrc/src/main/kotlin/cql.library-conventions.gradle.kts b/Src/java/buildSrc/src/main/kotlin/cql.library-conventions.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 dependencies {
     // Various libraries for Android signatures are available, Jackson uses this one
-    signature("com.toasttab.android:gummy-bears-api-${project.findProperty("android.api.level")}:0.5.0@signature")
+    signature("com.toasttab.android:gummy-bears-api-${project.findProperty("android.api.level")}:0.10.0:coreLib2@signature")
 }
 
 tasks.animalsnifferTest {

diff --git a/Src/java/gradle.properties b/Src/java/gradle.properties
@@ -10,4 +10,4 @@ specification.version=1.5.2
 hapi.version=7.4.5
 jackson.version=2.17.1
 antlr.version=4.13.1
-android.api.level=28
+android.api.level=26