Skip to content

Commit

Permalink
Merge branch 'develop' into chore/report_test_coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
nowakweronika committed Nov 16, 2023
2 parents fc7dca8 + 7477215 commit 5060651
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-code-quality-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
run: sudo chown -Rc $UID .git/
- name: Commit and push applied linter fixes
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) && !contains(github.event.head_commit.message, 'skip fix')
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
commit_message: "[MegaLinter] Apply linters fixes"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-snapshot-generation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: ./gradlew components:recordPaparazziDebug

- name: Commit and push recorded screenshots
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
commit_message: "[Paparazzi] Record new snapshots"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/verify-pr-description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ permissions: read-all

jobs:
verify:
if: ${{ github.actor != 'dependabot[bot]' }}
# To make sure the pull request was created by dependabot.
if: ${{ !contains(github.event.pull_request.title, 'bump') }}
name: Verify Pull-Request Description
runs-on: ubuntu-20.04

Expand Down
3 changes: 2 additions & 1 deletion app-shared-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ android {
excludes += 'META-INF/{AL2.0,LGPL2.1}'
excludes += 'META-INF/LICENSE.md'
excludes += 'META-INF/LICENSE-notice.md'
excludes += 'META-INF/versions/9/previous-compilation-data.bin'
}
}

Expand Down Expand Up @@ -107,4 +108,4 @@ dependencies {

// ktlint
ktlintRuleset project(":custom-ktlint-rules")
}
}
3 changes: 2 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ android {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
excludes += '/META-INF/LICENSE.md'
excludes += '/META-INF/LICENSE-notice.md'
excludes += '/META-INF/versions/9/previous-compilation-data.bin'
}
}
testOptions {
Expand Down Expand Up @@ -185,7 +186,7 @@ dependencies {
implementation "io.ktor:ktor-serialization-kotlinx-json:$ktor_version"
testImplementation("io.ktor:ktor-client-mock:$ktor_version")

implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.1")
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
testImplementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")

Expand Down
3 changes: 3 additions & 0 deletions app/src/test/java/com/appunite/loudius/ActivitySetupTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.appunite.loudius

import android.os.Build
import androidx.activity.ComponentActivity
import androidx.test.core.app.ActivityScenario
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand All @@ -24,8 +25,10 @@ import org.junit.Before
import org.junit.Test
import org.junit.jupiter.api.DisplayName
import org.junit.runner.RunWith
import org.robolectric.annotation.Config

@RunWith(AndroidJUnit4::class)
@Config(sdk = [Build.VERSION_CODES.Q])
@DisplayName("ensure activity tests are set correctly")
class ActivitySetupTest {

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
buildscript {
ext {
compose_version = '1.3.3'
ktor_version = '2.3.4'
ktor_version = '2.3.5'
koin_version = '3.5.0'
}
}
Expand Down

0 comments on commit 5060651

Please sign in to comment.