Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 285af62f authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Upgrade dependencies; use Java 17

parent ebed43ef
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -8,19 +8,17 @@ 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
        run: ./gradlew --no-daemon dokkaHtml
      - name: Publish KDoc
        if: success()
        uses: crazy-max/ghaction-github-pages@v2.5.0
        uses: crazy-max/ghaction-github-pages@v2
        with:
          target_branch: gh-pages
          build_dir: build/dokka/html
+8 −24
Original line number Diff line number Diff line
@@ -33,40 +33,24 @@ jobs:
      fail-fast: false
      matrix:
        language: [ 'java' ]
        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

    steps:
    - name: Checkout repository
      uses: actions/checkout@v3
    - uses: actions/setup-java@v2
      with:
        distribution: temurin
        java-version: 17
        cache: gradle
    - uses: gradle/wrapper-validation-action@v1

    # 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.

    # - 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
+3 −7
Original line number Diff line number Diff line
@@ -6,16 +6,14 @@ 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
        run: ./gradlew check
        run: ./gradlew --no-daemon check
      - name: Archive results
        uses: actions/upload-artifact@v2
        with:
@@ -32,12 +30,10 @@ jobs:
        api-level: [ 31 ]
    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: Enable KVM group perms
+12 −6
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ buildscript {
    }

    dependencies {
        classpath 'com.android.tools.build:gradle:7.4.2'
        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}"
    }
@@ -33,17 +33,21 @@ android {
    buildToolsVersion '33.0.2'

    defaultConfig {
        minSdkVersion 21        // Android 5.0
        targetSdkVersion 32     // Android 12v2
        minSdkVersion 21        // Android 5
        targetSdkVersion 33     // Android 13
    }

    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17

        coreLibraryDesugaringEnabled true
    }

    buildFeatures {
        buildConfig = true
    }

    namespace 'at.bitfire.vcard4android'

    buildTypes {
@@ -52,11 +56,13 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }

    packagingOptions {
        resources {
            excludes += ['LICENSE', 'META-INF/LICENSE.txt', 'META-INF/NOTICE.txt']
        }
    }

    lint {
        disable 'AllowBackup', 'InvalidPackage'
    }
+1 −1
Original line number Diff line number Diff line
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists