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

Commit add95e94 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge tag '6.711' into 1472-Update_to_upstream_6_711

parents 24b894d4 8b9abf2b
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ charset = utf-8
indent_size = 4
indent_style = space
insert_final_newline = true
end_of_line = lf

[*.{kt,kts}]
ij_kotlin_imports_layout = *,^
+3 −2
Original line number Diff line number Diff line
* text=auto eol=lf
* text=auto

*.bat text eol=crlf
*.bat eol=crlf
*.eml eol=crlf
*.jar binary
+6 −0
Original line number Diff line number Diff line
org.gradle.daemon=false
org.gradle.parallel=true
org.gradle.workers.max=2

kotlin.incremental=false
kotlin.compiler.execution.strategy=in-process
+21 −3
Original line number Diff line number Diff line
@@ -16,16 +16,34 @@ jobs:
  validation:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
      - uses: actions/checkout@v4
      - uses: gradle/wrapper-validation-action@v1

  build:
    runs-on: ubuntu-latest
    timeout-minutes: 90

    steps:
      - uses: actions/checkout@v3
      - uses: actions/checkout@v4

      - name: Copy CI gradle.properties
        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties

      - uses: actions/setup-java@v3
        with:
          distribution: temurin
          java-version: 17

      - uses: gradle/gradle-build-action@v2
      - run: ./gradlew assembleDebug detekt spotlessCheck testsOnCi

      - name: Quality - Spotless
        run: ./gradlew spotlessCheck

      - name: Quality - Detekt
        run: ./gradlew detekt

      - name: Build
        run: ./gradlew assembleDebug

      - name: Test
        run: ./gradlew testsOnCi
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ jobs:
      security-events: write

    steps:
      - uses: actions/checkout@v3
      - uses: actions/checkout@v4

      - uses: actions/setup-java@v3
        with:
Loading