From db25c18d45f080945135e0c8c1ca70f61ab6d14b Mon Sep 17 00:00:00 2001 From: Niek Haarman Date: Fri, 12 Sep 2025 18:52:30 +0200 Subject: [PATCH 1/2] Update build --- .github/workflows/pull_request.yml | 9 + .idea/codeStyles/Project.xml | 35 ++++ .idea/misc.xml | 2 +- .ops/publishing-android.gradle | 20 --- .ops/publishing-base.gradle | 82 --------- .ops/publishing-kotlin.gradle | 16 -- .ops/publishing.gradle | 166 ++++++++++++++++++ build.gradle | 41 ++--- core/acorn-android-core/build.gradle | 1 - dependencies.gradle | 28 +-- .../acorn-android-appcompat/build.gradle | 1 - .../acorn/android/AcornAppCompatActivity.kt | 30 ++++ .../acorn-android-lifecycle/build.gradle | 1 - .../acorn-android-statechecks/build.gradle | 1 - .../acorn-android-testing/build.gradle | 1 - .../acorn-android-timber/build.gradle | 1 - ext/acorn-android/build.gradle | 1 - .../nhaarman/acorn/android/AcornActivity.kt | 14 ++ gradle.properties | 3 + gradle/wrapper/gradle-wrapper.jar | Bin 62076 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 22 ++- releasing.md | 66 ++++++- .../FirstScene.kt | 1 + .../pictures/PictureContentProvider.kt | 3 +- .../AppSettingsActivityController.kt | 4 +- settings.gradle | 1 + 27 files changed, 370 insertions(+), 183 deletions(-) delete mode 100644 .ops/publishing-android.gradle delete mode 100644 .ops/publishing-base.gradle delete mode 100644 .ops/publishing-kotlin.gradle create mode 100644 .ops/publishing.gradle diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 7ba90982..19c5d8f5 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -21,6 +21,15 @@ jobs: distribution: 'zulu' java-version: '17' + - name: Setup Android SDK + uses: android-actions/setup-android@v2 + + - name: Install Android SDK components + run: | + echo "sdk.dir=$ANDROID_SDK_ROOT" > local.properties + sdkmanager --install "platform-tools" "platforms;android-34" "build-tools;34.0.0" + yes | sdkmanager --licenses + - name: ktlint run: bash ./ktlint "**/src/**/*.kt" --color diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index f83279ab..403b2389 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -2,6 +2,41 @@