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

Commit 62814abf authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update libraries and workflows

parent 8996266d
Loading
Loading
Loading
Loading
+2 −25
Original line number Diff line number Diff line
@@ -22,45 +22,23 @@ jobs:
      fail-fast: false
      matrix:
        language: [ 'java' ]
        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
        # Use only 'java' to analyze code written in Java, Kotlin or both
        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

    steps:
    - name: Checkout repository
      uses: actions/checkout@v3
      with:
        submodules: recursive
    - uses: actions/setup-java@v2
    - uses: actions/setup-java@v3
      with:
        distribution: 'temurin'
        java-version: 17
        cache: 'gradle'
    - uses: gradle/wrapper-validation-action@v1
    - 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: Build
      run: ./gradlew --no-daemon app:assembleStandardDebug
@@ -69,4 +47,3 @@ jobs:
      uses: github/codeql-action/analyze@v2
      with:
        category: "/language:${{matrix.language}}"
+5 −5
Original line number Diff line number Diff line
@@ -10,21 +10,21 @@ jobs:
      contents: write
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - uses: actions/checkout@v3
        with:
          submodules: true
      - uses: actions/setup-java@v2
      - uses: actions/setup-java@v3
        with:
          distribution: 'temurin'
          java-version: 17
          cache: 'gradle'
      - uses: gradle/wrapper-validation-action@v1
      - uses: gradle/gradle-build-action@v2

      - name: Prepare keystore
        run: echo ${{ secrets.android_keystore_base64 }} | base64 -d >$GITHUB_WORKSPACE/keystore.jks

      - name: Build signed packages
        run: ./gradlew --no-daemon app:assembleRelease
        # AboutLibraries 10.6.3 doesn't show any dependencies when configuration cache is used
        run: ./gradlew --no-configuration-cache --no-daemon app:assembleRelease
        env:
          ANDROID_KEYSTORE: ${{ github.workspace }}/keystore.jks
          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.android_keystore_password }}
+8 −6
Original line number Diff line number Diff line
@@ -5,18 +5,20 @@ jobs:
    name: Tests without emulator
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - uses: actions/checkout@v3
        with:
          submodules: true
      - uses: actions/setup-java@v2
      - uses: actions/setup-java@v3
        with:
          distribution: 'temurin'
          java-version: 17
      - uses: gradle/gradle-build-action@v2

      - name: Check
        run: ./gradlew --no-daemon app:lintStandardDebug app:testStandardDebugUnitTest
        run: ./gradlew app:lintStandardDebug app:testStandardDebugUnitTest

      - name: Archive results
        if: always()
        uses: actions/upload-artifact@v2
        with:
          name: test-results
@@ -31,10 +33,10 @@ jobs:
      matrix:
        api-level: [31]
    steps:
      - uses: actions/checkout@v2
      - uses: actions/checkout@v3
        with:
          submodules: true
      - uses: actions/setup-java@v2
      - uses: actions/setup-java@v3
        with:
          distribution: 'temurin'
          java-version: 17
@@ -74,7 +76,7 @@ jobs:
          force-avd-creation: false
          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
          disable-animations: true
          script: ./gradlew --no-daemon app:connectedStandardDebugAndroidTest
          script: ./gradlew app:connectedStandardDebugAndroidTest

      - name: Archive results
        if: always()
+6 −7
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ apply plugin: 'com.google.devtools.ksp'

android {
    compileSdkVersion 33
    buildToolsVersion '33.0.0'
    buildToolsVersion '33.0.2'

    namespace 'at.bitfire.icsdroid'

@@ -36,15 +36,14 @@ android {

    buildFeatures {
        buildConfig = true
        viewBinding = true
        dataBinding = true
        compose = true
        dataBinding = true
        viewBinding = true
    }

    composeOptions {
        // Keep this in sync with Kotlin version:
        // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
        kotlinCompilerExtensionVersion = "${versions.compose}"
        // Keep in sync with Kotlin version: https://developer.android.com/jetpack/androidx/releases/compose-kotlin
        kotlinCompilerExtensionVersion = '1.4.7'
    }

    flavorDimensions "distribution"
@@ -85,7 +84,7 @@ android {
}

dependencies {
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'

    implementation project(':cert4android')
+5 −6
Original line number Diff line number Diff line
buildscript {
    ext.versions = [
        aboutLibs: '10.6.2',
        kotlin: '1.8.20',
        okhttp: '5.0.0-alpha.11',
        aboutLibs: '10.6.3',
        composeBom: '2023.05.01',   // https://developer.android.com/jetpack/compose/bom
        kotlin: '1.8.21',           // keep in sync with app/build.gradle composeOptions.kotlinCompilerExtensionVersion
        ksp: '1.0.11',
        room: '2.5.1',
        compose: '1.4.6',
        composeBom: '2023.04.01'        // https://developer.android.com/jetpack/compose/bom
        okhttp: '5.0.0-alpha.11',
        room: '2.5.1'
    ]

    repositories {
Loading