diff --git a/.github/workflows/android-test.yml b/.github/workflows/android-test.yml index 412d3ac..a07a6df 100644 --- a/.github/workflows/android-test.yml +++ b/.github/workflows/android-test.yml @@ -9,6 +9,9 @@ on: paths-ignore: - "app/src/main/**" +permissions: + checks: write + jobs: unit: runs-on: ubuntu-latest @@ -59,4 +62,4 @@ jobs: uses: mikepenz/action-junit-report@v4 if: always() # always run even if the previous step fails with: - report_paths: '**/build/test-results/**/TEST-*.xml' + report_paths: '**/build/androidTest-results/**/TEST-*.xml' diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml new file mode 100644 index 0000000..6af00c3 --- /dev/null +++ b/.github/workflows/auto-approve.yml @@ -0,0 +1,24 @@ +name: auto-approve + +on: + pull_request_target: + types: + - opened + - synchronize + workflow_dispatch: + inputs: + pullRequestNumber: + description: Pull request number to auto-approve + required: false + +jobs: + auto-approve: + runs-on: ubuntu-latest + permissions: + pull-requests: write + if: github.actor == 'renovate[bot]' || github.event_name == 'workflow_dispatch' + steps: + - uses: hmarr/auto-approve-action@v3 + with: + review-message: "Auto approved automated PR" + pull-request-number: ${{ github.event.inputs.pullRequestNumber }} \ No newline at end of file diff --git a/buildSrc/src/main/java/io/wax911/emoji/buildSrc/plugin/components/AndroidConfiguration.kt b/buildSrc/src/main/java/io/wax911/emoji/buildSrc/plugin/components/AndroidConfiguration.kt index 401a44f..86fd4ce 100644 --- a/buildSrc/src/main/java/io/wax911/emoji/buildSrc/plugin/components/AndroidConfiguration.kt +++ b/buildSrc/src/main/java/io/wax911/emoji/buildSrc/plugin/components/AndroidConfiguration.kt @@ -44,10 +44,10 @@ private fun DefaultConfig.applyAdditionalConfiguration(project: Project) { } internal fun Project.configureAndroid(): Unit = baseExtension().run { - compileSdkVersion(33) + compileSdkVersion(34) defaultConfig { minSdk = 23 - targetSdk = 33 + targetSdk = 34 versionCode = props[PropertyTypes.CODE].toInt() versionName = props[PropertyTypes.VERSION] testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 86681d6..1844ba7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ jetbrains-kotlinx-coroutines = "1.7.3" jetbrains-kotlinx-datetime = "0.4.1" jetbrains-kotlinx-serialization = "1.6.0" -mockk = "1.13.7" +mockk = "1.13.8" [plugins]