From e5fdbae3b26a4bd0713e1861260eb29454d778ad Mon Sep 17 00:00:00 2001 From: HRiggs Date: Sun, 14 Dec 2025 22:20:02 -0500 Subject: [PATCH] update andriod sdk --- .gitea/workflows/release.yml | 40 ++++++++++++++-- flutter_app/pubspec.lock | 88 ++++++++---------------------------- 2 files changed, 56 insertions(+), 72 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 77e8d81..6c50dba 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -35,8 +35,9 @@ jobs: - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: '3.24.5' + flutter-version: '3.22.3' channel: 'stable' + cache: true - name: Enable Windows desktop run: flutter config --enable-windows-desktop @@ -54,6 +55,9 @@ jobs: working-directory: flutter_app run: flutter pub get + - name: Flutter doctor + run: flutter doctor -v + - name: Build Windows release working-directory: flutter_app run: flutter build windows --release @@ -83,11 +87,29 @@ jobs: distribution: 'temurin' java-version: '17' + - name: Setup Android SDK + uses: android-actions/setup-android@v3 + with: + api-level: 34 + build-tools: 34.0.0 + cmake: 3.22.1 + ndk: 25.1.8937393 + + - name: Accept Android SDK licenses + run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses || true + - name: Setup Flutter uses: subosito/flutter-action@v2 with: - flutter-version: '3.24.5' + flutter-version: '3.22.3' channel: 'stable' + cache: true + + - name: Accept Flutter Android licenses + run: flutter doctor --android-licenses || true + + - name: Flutter doctor + run: flutter doctor -v - name: Create production .env file working-directory: flutter_app @@ -102,14 +124,24 @@ jobs: working-directory: flutter_app run: flutter pub get + - name: Clean build + working-directory: flutter_app + run: flutter clean + - name: Build Android APK working-directory: flutter_app - run: flutter build apk --release + run: flutter build apk --release --verbose + + - name: Verify APK exists + working-directory: flutter_app + run: | + ls -la build/app/outputs/flutter-apk/ + file build/app/outputs/flutter-apk/app-release.apk - name: Rename APK working-directory: flutter_app run: | - mv build/app/outputs/flutter-apk/app-release.apk rmtPocketWatcher-Android-v${{ needs.get-version.outputs.version }}.apk + cp build/app/outputs/flutter-apk/app-release.apk rmtPocketWatcher-Android-v${{ needs.get-version.outputs.version }}.apk - name: Upload Android artifact uses: actions/upload-artifact@v4 diff --git a/flutter_app/pubspec.lock b/flutter_app/pubspec.lock index d87b898..c5f4777 100644 --- a/flutter_app/pubspec.lock +++ b/flutter_app/pubspec.lock @@ -109,10 +109,10 @@ packages: dependency: "direct main" description: name: fl_chart - sha256: "5276944c6ffc975ae796569a826c38a62d2abcf264e26b88fa6f482e107f4237" + sha256: d0f0d49112f2f4b192481c16d05b6418bd7820e021e265a3c22db98acf7ed7fb url: "https://pub.dev" source: hosted - version: "0.70.2" + version: "0.68.0" flutter: dependency: "direct main" description: flutter @@ -138,26 +138,26 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: ef41ae901e7529e52934feba19ed82827b11baa67336829564aeab3129460610 + sha256: "674173fd3c9eda9d4c8528da2ce0ea69f161577495a9cc835a2a4ecd7eadeb35" url: "https://pub.dev" source: hosted - version: "18.0.1" + version: "17.2.4" flutter_local_notifications_linux: dependency: transitive description: name: flutter_local_notifications_linux - sha256: "8f685642876742c941b29c32030f6f4f6dacd0e4eaecb3efbb187d6a3812ca01" + sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "4.0.1" flutter_local_notifications_platform_interface: dependency: transitive description: name: flutter_local_notifications_platform_interface - sha256: "6c5b83c86bf819cdb177a9247a3722067dd8cc6313827ce7c77a4b238a26fd52" + sha256: "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66" url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "7.2.0" flutter_test: dependency: "direct dev" description: flutter @@ -188,18 +188,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.20.2" - json_annotation: - dependency: transitive - description: - name: json_annotation - sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" - url: "https://pub.dev" - source: hosted - version: "4.9.0" + version: "0.19.0" leak_tracker: dependency: transitive description: @@ -364,42 +356,10 @@ packages: dependency: transitive description: name: screen_retriever - sha256: "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c" + sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90" url: "https://pub.dev" source: hosted - version: "0.2.0" - screen_retriever_linux: - dependency: transitive - description: - name: screen_retriever_linux - sha256: f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - screen_retriever_macos: - dependency: transitive - description: - name: screen_retriever_macos - sha256: "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149" - url: "https://pub.dev" - source: hosted - version: "0.2.0" - screen_retriever_platform_interface: - dependency: transitive - description: - name: screen_retriever_platform_interface - sha256: ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - screen_retriever_windows: - dependency: transitive - description: - name: screen_retriever_windows - sha256: "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13" - url: "https://pub.dev" - source: hosted - version: "0.2.0" + version: "0.1.9" shared_preferences: dependency: "direct main" description: @@ -569,10 +529,10 @@ packages: dependency: transitive description: name: timezone - sha256: dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1 + sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d" url: "https://pub.dev" source: hosted - version: "0.10.1" + version: "0.9.4" tray_manager: dependency: "direct main" description: @@ -609,34 +569,26 @@ packages: dependency: transitive description: name: web - sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" url: "https://pub.dev" source: hosted - version: "1.1.1" - web_socket: - dependency: transitive - description: - name: web_socket - sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" - url: "https://pub.dev" - source: hosted - version: "1.0.1" + version: "0.5.1" web_socket_channel: dependency: "direct main" description: name: web_socket_channel - sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 + sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "2.4.5" window_manager: dependency: "direct main" description: name: window_manager - sha256: "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059" + sha256: "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf" url: "https://pub.dev" source: hosted - version: "0.4.3" + version: "0.3.9" xdg_directories: dependency: transitive description: