diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index b5d24b77..83fb4e02 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -26,7 +26,7 @@ jobs: echo "$(( ${{ secrets.DEV_ENV_FILE_CONTENT }} + 67 ))" > .env shell: bash - - uses: reasje/action-flutter-build-android@main + - uses: sheenhx/action-flutter-build-android@main with: keystore-base64: ${{ secrets.ANDROID_RELEASE_KEY }} keystore-password: "${{ secrets.ANDROID_RELEASE_KEY_PASSWORD }}" @@ -52,117 +52,117 @@ jobs: source-dir: build/app/outputs/flutter-apk destination-dir: app - build-macos: - name: Build-ios - # https://github.com/actions/runner-images - # https://xcodereleases.com/ - runs-on: macos-15 - steps: - - name: Select Xcode version 16.3 - run: sudo xcode-select -s /Applications/Xcode_16.3.app + # build-macos: + # name: Build-ios + # # https://github.com/actions/runner-images + # # https://xcodereleases.com/ + # runs-on: macos-15 + # steps: + # - name: Select Xcode version 16.3 + # run: sudo xcode-select -s /Applications/Xcode_16.3.app - - name: Checkout code with submodules - uses: actions/checkout@v4 - with: - submodules: recursive + # - name: Checkout code with submodules + # uses: actions/checkout@v4 + # with: + # submodules: recursive - - name: Setup .env file - run: | - echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env - shell: bash - - - uses: sheenhx/action-flutter-build-ios@main - with: - # always use --export-options-plist=ios/GithubActionsExportOptions.plist - build-cmd: flutter build ipa --build-number=$(( 15 + ${{ github.run_number }})) --export-options-plist=ios/GithubActionsExportOptions.plist - certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }} - certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }} - provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }} - keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }} - - - name: Archive IPA - uses: actions/upload-artifact@v4 - with: - name: release-ipa - # Try running the build locally with the build command to be sure of this path - path: build/ios/ipa/*.ipa - - build-macos-simulator: - name: Build-ios-simulator - # https://github.com/actions/runner-images - # https://xcodereleases.com/ - runs-on: macos-15 - - steps: - - name: Select Xcode version 16.3 - run: sudo xcode-select -s /Applications/Xcode_16.3.app + # - name: Setup .env file + # run: | + # echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env + # shell: bash + + # - uses: sheenhx/action-flutter-build-ios@main + # with: + # # always use --export-options-plist=ios/GithubActionsExportOptions.plist + # build-cmd: flutter build ipa --build-number=$(( 15 + ${{ github.run_number }})) --export-options-plist=ios/GithubActionsExportOptions.plist + # certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }} + # certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }} + # provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }} + # keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }} + + # - name: Archive IPA + # uses: actions/upload-artifact@v4 + # with: + # name: release-ipa + # # Try running the build locally with the build command to be sure of this path + # path: build/ios/ipa/*.ipa + + # build-macos-simulator: + # name: Build-ios-simulator + # # https://github.com/actions/runner-images + # # https://xcodereleases.com/ + # runs-on: macos-15 + + # steps: + # - name: Select Xcode version 16.3 + # run: sudo xcode-select -s /Applications/Xcode_16.3.app - - name: Checkout code with submodules - uses: actions/checkout@v4 - with: - submodules: recursive + # - name: Checkout code with submodules + # uses: actions/checkout@v4 + # with: + # submodules: recursive - - name: Setup .env file - run: | - echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env - shell: bash - - - uses: sheenhx/action-flutter-build-ios@main - with: - # always use --export-options-plist=ios/GithubActionsExportOptions.plist - build-cmd: flutter build ios --simulator --no-codesign --debug --dart-define=FLUTTER_BUILD_MODE=debug - certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }} - certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }} - provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }} - keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }} - - - name: Archive .app - uses: actions/upload-artifact@v4 - with: - name: simulator-app - # Try running the build locally with the build command to be sure of this path - path: build/ios/iphonesimulator/*.app - - upload-combined: - permissions: write-all - name: Combine and Upload Builds - needs: [build-apk, build-macos] - runs-on: ubuntu-latest - steps: - - name: Download Ubuntu artifact - uses: actions/download-artifact@v4 - with: - name: release-apk - path: combined-builds/android - - - name: Download macOS artifact - uses: actions/download-artifact@v4 - with: - name: release-ipa - path: combined-builds/iOS - - - name: Upload combined artifacts - uses: actions/upload-artifact@v4 - with: - name: combined-builds - path: combined-builds - - - name: Generate - id: generate - uses: AcmeSoftwareLLC/app-build-number@v1 - with: - timezone: Asia/Kathmandu + # - name: Setup .env file + # run: | + # echo "${{ secrets.DEV_ENV_FILE_CONTENT }}" > .env + # shell: bash + + # - uses: sheenhx/action-flutter-build-ios@main + # with: + # # always use --export-options-plist=ios/GithubActionsExportOptions.plist + # build-cmd: flutter build ios --simulator --no-codesign --debug --dart-define=FLUTTER_BUILD_MODE=debug + # certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }} + # certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }} + # provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }} + # keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }} + + # - name: Archive .app + # uses: actions/upload-artifact@v4 + # with: + # name: simulator-app + # # Try running the build locally with the build command to be sure of this path + # path: build/ios/iphonesimulator/*.app + + # upload-combined: + # permissions: write-all + # name: Combine and Upload Builds + # needs: [build-apk, build-macos] + # runs-on: ubuntu-latest + # steps: + # - name: Download Ubuntu artifact + # uses: actions/download-artifact@v4 + # with: + # name: release-apk + # path: combined-builds/android + + # - name: Download macOS artifact + # uses: actions/download-artifact@v4 + # with: + # name: release-ipa + # path: combined-builds/iOS + + # - name: Upload combined artifacts + # uses: actions/upload-artifact@v4 + # with: + # name: combined-builds + # path: combined-builds + + # - name: Generate + # id: generate + # uses: AcmeSoftwareLLC/app-build-number@v1 + # with: + # timezone: Asia/Kathmandu - - name: Display the generated build number - run: echo "Build Number > ${{ steps.generate.outputs.build-number }}" + # - name: Display the generated build number + # run: echo "Build Number > ${{ steps.generate.outputs.build-number }}" - - uses: ncipollo/release-action@v1 - with: - artifacts: "combined-builds/android/*.apk,combined-builds/iOS/*.ipa" - tag: ${{ steps.generate.outputs.build-number }} - name: "Nightly-v${{ steps.generate.outputs.build-number }}-iOS/Android-Visit mxc1usd.com" - generateReleaseNotes: true - body: > - imageimage + # - uses: ncipollo/release-action@v1 + # with: + # artifacts: "combined-builds/android/*.apk,combined-builds/iOS/*.ipa" + # tag: ${{ steps.generate.outputs.build-number }} + # name: "Nightly-v${{ steps.generate.outputs.build-number }}-iOS/Android-Visit mxc1usd.com" + # generateReleaseNotes: true + # body: > + # imageimage diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index d77352f9..67e93d1f 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -24,7 +24,7 @@ jobs: echo "$(( ${{ secrets.PROD_ENV_FILE_CONTENT }} + 67 ))" > .env shell: bash - - uses: reasje/action-flutter-build-android@main + - uses: sheenhx/action-flutter-build-android@main with: keystore-base64: ${{ secrets.ANDROID_RELEASE_KEY }} keystore-password: "${{ secrets.ANDROID_RELEASE_KEY_PASSWORD }}" diff --git a/android/app/build.gradle b/android/app/build.gradle index ae04d290..b18e0cf1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -36,7 +36,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { namespace "com.moonchain.app" - + compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion "33.0.1" ndkVersion flutter.ndkVersion @@ -63,10 +63,6 @@ android { // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 21 minSdk 21 - manifestPlaceholders = [ - minSdkVersion: "21", - applicationName: "android.app.Application" - ] targetSdkVersion rootProject.ext.targetSdkVersion versionCode System.getenv('VERSION_CODE')?.hashCode()?.abs() ?: 404 versionName flutterVersionName diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a4975515..3b70fe04 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -52,7 +52,7 @@ - + # This is line is to disable Impeller =2.19.0 <=3.6.1" @@ -73,7 +73,7 @@ dependencies: flutter_svg: ^2.0.1 geolocator: ^10.1.0 google_sign_in: ^6.1.5 - h3_flutter: ^0.6.6 + h3_flutter: ^0.7.0 hooks_riverpod: ^1.0.3 icloud_storage: ^2.2.0 jdenticon_dart: ^2.0.0 @@ -113,6 +113,7 @@ dependency_overrides: http: ^0.13.5 intl: ^0.17.0 web_socket_channel: ^2.2.0 + js: ^0.7.2 dev_dependencies: build_runner: ^2.4.15