diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml index dbd607c362b..cd0560df4f9 100644 --- a/.github/workflows/mobile.yml +++ b/.github/workflows/mobile.yml @@ -806,13 +806,6 @@ jobs: du -sh ~/.android/sdk 2>/dev/null || echo "Default SDK path not found" fi - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - name: Release Android (Release Candidate) timeout-minutes: 60 env: @@ -1192,13 +1185,6 @@ jobs: du -sh ~/.android/sdk 2>/dev/null || echo "Default SDK path not found" fi - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v4 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - name: Release Android (Production) timeout-minutes: 60 env: diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle index 589fb130426..250af6db7bf 100755 --- a/packages/mobile/android/app/build.gradle +++ b/packages/mobile/android/app/build.gradle @@ -134,7 +134,7 @@ android { // versionCode is automatically incremented in CI versionCode 1 // Make sure this is above the currently released Android version in the play store if your changes touch native code: - versionName "1.1.533" + versionName "1.1.534" resValue "string", "build_config_package", "co.audius.app" resConfigs "en" } diff --git a/packages/mobile/android/fastlane/Fastfile b/packages/mobile/android/fastlane/Fastfile index d12682fd9db..308e2d31903 100644 --- a/packages/mobile/android/fastlane/Fastfile +++ b/packages/mobile/android/fastlane/Fastfile @@ -70,19 +70,15 @@ platform :android do if packageName === PROD_PACKAGE taskName = 'bundleProdRelease' aab = './app/build/outputs/bundle/prodRelease/app-prod-release.aab' - remoteDirectory = 'audius-mobile' elsif packageName === RC_PROD_PACKAGE taskName = 'bundleReleaseCandidateRelease' aab = './app/build/outputs/bundle/releaseCandidateRelease/app-releaseCandidate-release.aab' - remoteDirectory = 'audius-mobile-releasecandidate' elsif packageName === RC_STAGING_PACKAGE taskName = 'bundleStagingReleaseCandidateRelease' aab = './app/build/outputs/bundle/stagingReleaseCandidateRelease/app-stagingReleaseCandidate-release.aab' - remoteDirectory = 'audius-mobile-staging-releasecandidate' elsif packageName === STAGING_PACKAGE taskName = 'bundleStagingRelease' aab = './app/build/outputs/bundle/stagingRelease/app-staging-release.aab' - remoteDirectory = 'audius-mobile-staging' end releasedVersion = getCurrentlyReleasedVersionName() buildFileVersion = getVersionNameFromBuildFile() @@ -98,8 +94,6 @@ platform :android do # generating the release apk & bundle sh("cd ../../../../ && echo \"yes\" | sdkmanager \"platforms;android-30\" && cd packages/mobile/android && ./gradlew #{taskName}") - sh("cd ../../../../ && sudo pip install awscli") - sh("cd ../../../../ && aws s3 sync packages/mobile/android/app/build/outputs s3://#{remoteDirectory}/android --delete") upload_to_play_store( track: options[:track], package_name: packageName, diff --git a/packages/mobile/ios/AudiusReactNative/Info.plist b/packages/mobile/ios/AudiusReactNative/Info.plist index 186ccefd4dd..e9ba1818dd7 100644 --- a/packages/mobile/ios/AudiusReactNative/Info.plist +++ b/packages/mobile/ios/AudiusReactNative/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.197 + 1.1.198 CFBundleSignature ???? CFBundleURLTypes diff --git a/packages/mobile/ios/Podfile b/packages/mobile/ios/Podfile index f614fee63a6..d8809906e77 100644 --- a/packages/mobile/ios/Podfile +++ b/packages/mobile/ios/Podfile @@ -97,19 +97,34 @@ target 'AudiusReactNative' do end end - # Xcode 26 / Apple Clang enforces stricter consteval evaluation, which + # Xcode 26 / Apple Clang 17 enforces stricter consteval evaluation, which # breaks the fmt 11.0.2 that React Native 0.79 pins: # Pods/fmt/include/fmt/format-inl.h:59: error: call to consteval # function 'fmt::basic_format_string<...>' is not a constant expression - # FMT_USE_CONSTEVAL=0 forces the constexpr fallback. Fixed upstream in - # fmt 11.1+ / RN 0.80; this is a stopgap until we upgrade RN. - installer.pods_project.targets.each do |target| - next unless target.name == 'fmt' - target.build_configurations.each do |config| - defs = config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] || ['$(inherited)'] - defs = [defs] unless defs.is_a?(Array) - defs << 'FMT_USE_CONSTEVAL=0' unless defs.include?('FMT_USE_CONSTEVAL=0') - config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = defs + # + # In fmt 11.0.2's include/fmt/base.h, the FMT_USE_CONSTEVAL detection + # block is NOT guarded by `#ifndef FMT_USE_CONSTEVAL`, so passing + # `-DFMT_USE_CONSTEVAL=0` is clobbered by the elif chain. The chain has + # an Apple-specific carve-out: + # #elif defined(__apple_build_version__) && __apple_build_version__ < 14000029L + # #define FMT_USE_CONSTEVAL 0 // consteval is broken in Apple clang < 14. + # which used to trip the disable for old Apple Clang but lets Xcode 26 + # through. + # + # Patch the source to drop the `< 14000029L` clause so consteval is + # disabled for ALL Apple Clang builds, falling back to constexpr. This + # matches the behavior on the old runner and matches what RN's own + # backport does at the version-bump level (fmt 12.1.0, RN PR #56225). + fmt_base_h = File.join(__dir__, 'Pods/fmt/include/fmt/base.h') + if File.exist?(fmt_base_h) + text = File.read(fmt_base_h) + patched = text.gsub( + '#elif defined(__apple_build_version__) && __apple_build_version__ < 14000029L', + '#elif defined(__apple_build_version__)' + ) + if patched != text + File.write(fmt_base_h, patched) + Pod::UI.puts "Patched Pods/fmt/include/fmt/base.h: disable consteval for all Apple Clang (Xcode 26 fmt 11.0.2 compat)".green end end diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 02574955bc7..529c38de4e1 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@audius/mobile", - "version": "1.5.184", + "version": "1.5.185", "private": true, "scripts": { "android:dev": "ENVFILE=.env.dev turbo run android -- --mode=prodDebug",