diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index e0318c3e4b..8f4948c580 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -89,8 +89,8 @@ jobs: sed -i 's/defonce version ".*"/defonce version "${{ steps.ref.outputs.version }}"/g' src/main/frontend/version.cljs sed -i 's/versionName ".*"/versionName "${{ steps.ref.outputs.version }}"/g' android/app/build.gradle - - name: Compile CLJS - run: yarn install && yarn release + - name: Compile CLJS - android variant, use es6 instead of es-next + run: yarn install && yarn release-android-app - name: Upload Sentry Sourcemaps (beta only) if: ${{ inputs.build-target == 'beta' || github.event.inputs.build-target == 'beta' }} diff --git a/package.json b/package.json index e6301fbe4e..8c4d203235 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "app-watch": "run-p gulp:watch cljs:app-watch", "release": "run-s gulp:build cljs:release", "release-app": "run-s gulp:build cljs:release-app", + "release-android-app": "run-s gulp:build cljs:release-android-app", "dev-release-app": "run-s gulp:build cljs:dev-release-app", "dev-electron-app": "gulp electron", "release-electron": "run-s gulp:build && gulp electronMaker", @@ -55,6 +56,7 @@ "cljs:release": "clojure -M:cljs release app publishing electron", "cljs:release-electron": "clojure -M:cljs release app electron --debug && clojure -M:cljs release publishing", "cljs:release-app": "clojure -M:cljs release app", + "cljs:release-android-app": "clojure -M:cljs release app --config-merge '{:compiler-options {:output-feature-set :es6}}'", "cljs:test": "clojure -M:test compile test", "cljs:run-test": "node static/tests.js", "cljs:dev-release-app": "clojure -M:cljs release app --config-merge '{:closure-defines {frontend.config/DEV-RELEASE true}}'",