Upgrade dependencies; use Java 17

Author: rfc2822

.github/workflows/build-kdoc.yml

@@ -8,12 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          submodules: true
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - uses: gradle/gradle-build-action@v2
 
       - name: Build KDoc

.github/workflows/codeql.yml

@@ -40,33 +40,25 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - uses: actions/setup-java@v2
+      with:
+        distribution: 'temurin'
+        java-version: 17
+    - uses: gradle/gradle-build-action@v2
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines.
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+    #- name: Autobuild
+    #  uses: github/codeql-action/autobuild@v2
 
-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
+    - name: Build
+      run: ./gradlew --no-daemon assemble
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/test-dev.yml

@@ -6,12 +6,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          submodules: true
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - uses: gradle/gradle-build-action@v2
 
       - name: Check
@@ -37,7 +35,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
       - uses: gradle/gradle-build-action@v2
 
       - name: Enable KVM group perms

build.gradle

@@ -4,9 +4,9 @@
 
 buildscript {
     ext.versions = [
-        kotlin: '1.7.21',
-        dokka: '1.7.20',
-        ical4j: '3.2.10',
+        kotlin: '1.8.20',
+        dokka: '1.8.10',
+        ical4j: '3.2.11',
         // latest Apache Commons versions that don't require Java 8 (Android 7)
         commonsIO: '2.6'
     ]
@@ -17,7 +17,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
     }
@@ -36,44 +36,47 @@ android {
     compileSdkVersion 33
     buildToolsVersion '33.0.0'
 
+    namespace 'at.bitfire.ical4android'
+
     defaultConfig {
         minSdkVersion 21        // Android 5.0
-        targetSdkVersion 32     // Android 12
+        targetSdkVersion 33     // Android 13
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "version_ical4j", "\"${versions.ical4j}\""
     }
 
-    namespace 'at.bitfire.ical4android'
-
     compileOptions {
         // ical4j >= 3.x uses the Java 8 Time API
         coreLibraryDesugaringEnabled true
 
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    buildFeatures {
+        buildConfig = true
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
+
+    sourceSets {
+        main.java.srcDirs = [ "src/main/java", "opentasks-contract/src/main/java" ]
     }
+
     packagingOptions {
         resources {
             excludes += ['META-INF/DEPENDENCIES', 'META-INF/LICENSE', 'META-INF/*.md']
         }
     }
+
     lint {
         disable 'AllowBackup', 'InvalidPackage'
     }
-
-    sourceSets {
-        main.java.srcDirs = [ "src/main/java", "opentasks-contract/src/main/java" ]
-    }
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'    // 2.0.0 produces "Unsupported desugared library configuration version, please upgrade the D8/R8 compiler."
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
     api("org.mnode.ical4j:ical4j:${versions.ical4j}") {
         // exclude modules which are in conflict with system libraries
@@ -85,15 +88,23 @@ dependencies {
     }
     // ical4j requires newer Apache Commons libraries, which require Java8. Force latest Java7 versions.
     // noinspection GradleDependency
-    api("org.apache.commons:commons-collections4:4.2") { force = true }
+    api("org.apache.commons:commons-collections4") {
+        version {
+            strictly '4.2'
+        }
+    }
     // noinspection GradleDependency
-    api("org.apache.commons:commons-lang3:3.8.1") { force = true }
+    api("org.apache.commons:commons-lang3:3.8.1") {
+        version {
+            strictly '3.8.1'
+        }
+    }
 
     // noinspection GradleDependency
     implementation "commons-io:commons-io:${versions.commonsIO}"
 
     implementation 'org.slf4j:slf4j-jdk14:2.0.3'
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.0'
 
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test:runner:1.5.2'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists