release version 5.0.3

.github/workflows/upload-android.yml

@@ -10,15 +10,17 @@ on:
       - ".github/workflows/upload-android.yml"
 
 env:
-  RELEASE_KEY_STORE_BASE64: ${{ secrets.ANDROID_SIGNING_KEY_BASE64 }}
-  SERVICE_ACCOUNT_JSON: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-  DEBUG_KEY_STORE_BASE64: ${{ secrets.DEBUG_SIGNING_KEY_BASE64 }}
-  EXPORT_PRESET_CFG: ${{ secrets.GODOT_EXPORTS_PRESET_CFG }}
   WORKING_DIRECTORY: game
+  SERVICE_ACCOUNT_JSON: ${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }}
+  ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+  ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
+  ANDROID_STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }}
+  ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+  ANDROID_KEYSTORE_DEBUG_BASE64: ${{ secrets.ANDROID_KEYSTORE_DEBUG_BASE64 }}
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
         uses: actions/checkout@v3
@@ -56,25 +58,27 @@ jobs:
       - name: Create service-account.json
         run: echo $SERVICE_ACCOUNT_JSON > service-account.json
 
-      - name: Create release keystore
-        run: echo $RELEASE_KEY_STORE_BASE64 | base64 --decode > keystore.keystore
-
-      - name: Create debug keystore
-        run: echo $DEBUG_KEY_STORE_BASE64 | base64 --decode > debug.keystore
+      - name: Create keystores
+        run: |
+          echo $ANDROID_KEYSTORE_BASE64 | base64 --decode > keystore.keystore
+          echo $ANDROID_KEYSTORE_DEBUG_BASE64 | base64 --decode > debug.keystore
 
-      - name: Create and config export_presets.cfg
+      - name: Create export_presets.cfg and inject values
         run: |
-          echo $EXPORT_PRESET_CFG > $WORKING_DIRECTORY/export_presets.cfg
-          sed -i "s|KEYSTORE_PATH|$GITHUB_WORKSPACE/keystore.keystore|g" $WORKING_DIRECTORY/export_presets.cfg
+          cp game/export_presets.android.example game/export_presets.cfg
           sed -i "s|VERSION_CODE|$VERSION_CODE|g" $WORKING_DIRECTORY/export_presets.cfg
           sed -i "s|VERSION_NAME|$VERSION_NAME|g" $WORKING_DIRECTORY/export_presets.cfg
+          sed -i "s|KEYSTORE_RELEASE_PATH|$GITHUB_WORKSPACE/keystore.keystore|g" $WORKING_DIRECTORY/export_presets.cfg
+          sed -i "s|KEYSTORE_DEBUG_PATH|$GITHUB_WORKSPACE/debug.keystore|g" $WORKING_DIRECTORY/export_presets.cfg
+          sed -i "s|ANDROID_KEYSTORE_ALIAS|$ANDROID_KEYSTORE_ALIAS|g" $WORKING_DIRECTORY/export_presets.cfg
+          sed -i "s|ANDROID_KEYSTORE_PASSWORD|$ANDROID_KEYSTORE_PASSWORD|g" $WORKING_DIRECTORY/export_presets.cfg
 
       - name: Delete iOS icons
         run: rm -rf $WORKING_DIRECTORY/AppIcons
 
       # GODOT EXPORT
       - name: Godot Android export
-        uses: dulvui/[email protected].0
+        uses: dulvui/[email protected].1
         with:
           working-directory: $WORKING_DIRECTORY
 
@@ -89,13 +93,13 @@ jobs:
           track: 'internal'
           status: completed
 
-      # BUNDLE FOR GITHUB RELEASES
+      # GITHUB RELEASES
       - name: Bundle aab to apk
         run: |
           wget -q https://github.com/google/bundletool/releases/download/1.14.0/bundletool-all-1.14.0.jar
           java -jar bundletool-all-1.14.0.jar build-apks --bundle=PocketBroomball.aab --output=PocketBroomball.apks \
-          --ks=keystore.keystore --ks-pass=pass:"${{ secrets.ANDROID_STORE_PASSWORD }}" --ks-key-alias=${{ secrets.ANDROID_KEYSTORE_ALIAS }} \
-          --key-pass=pass:"${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" --mode=universal
+          --ks=keystore.keystore --ks-pass=pass:$ANDROID_STORE_PASSWORD --ks-key-alias=$ANDROID_KEYSTORE_ALIAS \
+          --key-pass=pass:$ANDROID_KEYSTORE_PASSWORD --mode=universal
           unzip -p PocketBroomball.apks universal.apk > PocketBroomball.apk
       
       # UPLOAD TO GITHUB RELEASES

.github/workflows/upload-ios.yml

@@ -12,22 +12,23 @@ on:
 env:
   PROJECT_NAME: PocketBroomball
   WORKING_DIRECTORY: game
-  EXPORT_PRESET_CFG: ${{ secrets.GODOT_EXPORTS_PRESET_CFG }}
+  IOS_APPSTORE_TEAM_ID: ${{ secrets.IOS_APPSTORE_TEAM_ID }}
+  IOS_APPLE_ID_USERNAME: ${{ secrets.IOS_APPLE_ID_USERNAME }}
+  IOS_APPLE_ID_PASSWORD: ${{ secrets.IOS_APPLE_ID_PASSWORD }}
+  BUILD_CERTIFICATE_BASE64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
+  P12_PASSWORD: ${{ secrets.IOS_P12_PASSWORD }}
+  BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.IOS_PROVISION_PROFILE_BASE64 }}
+  KEYCHAIN_PASSWORD: ${{ secrets.IOS_KEYCHAIN_PASSWORD }}
 
 jobs:
   deploy:
-    runs-on: macos-13
+    runs-on: macos-latest
     steps:
       - name: Checkout source code
         uses: actions/checkout@v3
 
       # https://docs.github.com/en/actions/deployment/deploying-xcode-applications/installing-an-apple-certificate-on-macos-runners-for-xcode-development
       - name: Install the Apple certificate and provisioning profile
-        env:
-          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
-          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
-          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.PROVISION_PROFILE_BASE64 }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
         run: |
           # create variables
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
@@ -56,18 +57,18 @@ jobs:
 
       - name: Create and config export_presets.cfg
         run: |
-          echo $EXPORT_PRESET_CFG > $WORKING_DIRECTORY/export_presets.cfg
+          cp game/export_presets.example game/export_presets.cfg
           sed -i -e "s|VERSION_CODE|$VERSION|g" $WORKING_DIRECTORY/export_presets.cfg
           sed -i -e "s|VERSION_NAME|$VERSION|g" $WORKING_DIRECTORY/export_presets.cfg
           sed -i -e "s|IOS_SHORT_VERSION|$VERSION|g" $WORKING_DIRECTORY/export_presets.cfg
           sed -i -e "s|IOS_VERSION|$VERSION|g" $WORKING_DIRECTORY/export_presets.cfg
-          cat $WORKING_DIRECTORY/export_presets.cfg
+          sed -i -e "s|IOS_APPSTORE_TEAM_ID|$IOS_APPSTORE_TEAM_ID|g" $WORKING_DIRECTORY/export_presets.cfg
 
       - name: Export and upload to Testflight
         uses: dulvui/[email protected]
         with:
           working-directory: $WORKING_DIRECTORY
           project-name: $PROJECT_NAME
           provision-profile-path: ~/Library/MobileDevice/Provisioning\ Profiles/build_pp.mobileprovision
-          apple-id-username: ${{ secrets.APPLE_ID_USERNAME }}
-          apple-id-password: ${{ secrets.APPLE_ID_PASSWORD }}
+          apple-id-username: $IOS_APPLE_ID_USERNAME
+          apple-id-password: $IOS_APPLE_ID_PASSWORD

.github/workflows/upload-itchio.yml

@@ -9,11 +9,12 @@ on:
 
 env:
   WORKING_DIRECTORY: game
+  ITCHIO_API_KEY: ${{ secrets.ITCHIO_API_KEY }}
 
 jobs:
   deploy:
     if: github.ref == 'refs/heads/prod'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
         uses: actions/checkout@v3
@@ -28,12 +29,14 @@ jobs:
         uses: dulvui/[email protected]
         with:
           working-directory: $WORKING_DIRECTORY
+          create-export-preset-cfg: false
+
 
       - name: Upload to itch.io
         uses: dulvui/[email protected]
         with:
           working-directory: html5
-          api-key: ${{ secrets.ITCHIO_API_KEY }}
+          api-key: $ITCHIO_API_KEY
           user: simondalvai
           game: pocket-broomball
           channel: html5

README.md

@@ -20,6 +20,7 @@ This game is open source, with no ads and no tracking.
 - [Pocket Broomball](#pocket-broomball)
   - [Table of contents](#table-of-contents)
   - [Setup](#setup)
+    - [export\_presets.cfg](#export_presetscfg)
   - [Join with your Broomball team](#join-with-your-broomball-team)
   - [Arcade Highscores](#arcade-highscores)
   - [Contributions](#contributions)
@@ -37,6 +38,13 @@ repo. Then open the `game/project.godot` file with the editor.
 
 For further instructions, like exporting to mobile, please read the official [Godot Docs](https://docs.godotengine.org/en/stable/).
 
+### export_presets.cfg
+
+To be able to export for Android or iOS, copy the `export_presets.exmaple` file and fill in your values.
+```sh
+cp game/export_presets.example game/export_presets.cfg
+```
+
 ## Join with your Broomball team
 If you want to see your broomball team or even the whole league in the game,  
 just contact me at [email protected]  

game/export_presets.android.example

@@ -0,0 +1,205 @@
+[preset.0]
+
+name="Android"
+platform="Android"
+runnable=true
+custom_features=""
+export_filter="all_resources"
+include_filter="*.json"
+exclude_filter=""
+export_path="../PocketBroomball.aab"
+script_export_mode=1
+script_encryption_key=""
+
+[preset.0.options]
+
+custom_template/debug=""
+custom_template/release=""
+custom_build/use_custom_build=true
+custom_build/export_format=1
+custom_build/min_sdk=""
+custom_build/target_sdk=""
+architectures/armeabi-v7a=true
+architectures/arm64-v8a=true
+architectures/x86=false
+architectures/x86_64=false
+keystore/debug="KEYSTORE_DEBUG_PATH"
+keystore/debug_user="androiddebugkey"
+keystore/debug_password="android"
+keystore/release="KEYSTORE_RELEASE_PATH"
+keystore/release_user="ANDROID_KEYSTORE_ALIAS"
+keystore/release_password="ANDROID_KEYSTORE_PASSWORD"
+one_click_deploy/clear_previous_install=true
+version/code=VERSION_CODE
+version/name="VERSION_NAME"
+package/unique_name="com.salvai.broomball"
+package/name="Pocket Broomball"
+package/signed=true
+package/classify_as_game=true
+package/retain_data_on_uninstall=false
+package/exclude_from_recents=false
+launcher_icons/main_192x192=""
+launcher_icons/adaptive_foreground_432x432=""
+launcher_icons/adaptive_background_432x432=""
+graphics/opengl_debug=false
+xr_features/xr_mode=0
+xr_features/hand_tracking=0
+xr_features/hand_tracking_frequency=0
+xr_features/passthrough=0
+screen/immersive_mode=true
+screen/support_small=true
+screen/support_normal=true
+screen/support_large=true
+screen/support_xlarge=true
+user_data_backup/allow=true
+command_line/extra_args=""
+apk_expansion/enable=false
+apk_expansion/SALT=""
+apk_expansion/public_key=""
+permissions/custom_permissions=PoolStringArray(  )
+permissions/access_checkin_properties=false
+permissions/access_coarse_location=false
+permissions/access_fine_location=false
+permissions/access_location_extra_commands=false
+permissions/access_mock_location=false
+permissions/access_network_state=false
+permissions/access_surface_flinger=false
+permissions/access_wifi_state=false
+permissions/account_manager=false
+permissions/add_voicemail=false
+permissions/authenticate_accounts=false
+permissions/battery_stats=false
+permissions/bind_accessibility_service=false
+permissions/bind_appwidget=false
+permissions/bind_device_admin=false
+permissions/bind_input_method=false
+permissions/bind_nfc_service=false
+permissions/bind_notification_listener_service=false
+permissions/bind_print_service=false
+permissions/bind_remoteviews=false
+permissions/bind_text_service=false
+permissions/bind_vpn_service=false
+permissions/bind_wallpaper=false
+permissions/bluetooth=false
+permissions/bluetooth_admin=false
+permissions/bluetooth_privileged=false
+permissions/brick=false
+permissions/broadcast_package_removed=false
+permissions/broadcast_sms=false
+permissions/broadcast_sticky=false
+permissions/broadcast_wap_push=false
+permissions/call_phone=false
+permissions/call_privileged=false
+permissions/camera=false
+permissions/capture_audio_output=false
+permissions/capture_secure_video_output=false
+permissions/capture_video_output=false
+permissions/change_component_enabled_state=false
+permissions/change_configuration=false
+permissions/change_network_state=false
+permissions/change_wifi_multicast_state=false
+permissions/change_wifi_state=false
+permissions/clear_app_cache=false
+permissions/clear_app_user_data=false
+permissions/control_location_updates=false
+permissions/delete_cache_files=false
+permissions/delete_packages=false
+permissions/device_power=false
+permissions/diagnostic=false
+permissions/disable_keyguard=false
+permissions/dump=false
+permissions/expand_status_bar=false
+permissions/factory_test=false
+permissions/flashlight=false
+permissions/force_back=false
+permissions/get_accounts=false
+permissions/get_package_size=false
+permissions/get_tasks=false
+permissions/get_top_activity_info=false
+permissions/global_search=false
+permissions/hardware_test=false
+permissions/inject_events=false
+permissions/install_location_provider=false
+permissions/install_packages=false
+permissions/install_shortcut=false
+permissions/internal_system_window=false
+permissions/internet=false
+permissions/kill_background_processes=false
+permissions/location_hardware=false
+permissions/manage_accounts=false
+permissions/manage_app_tokens=false
+permissions/manage_documents=false
+permissions/manage_external_storage=false
+permissions/master_clear=false
+permissions/media_content_control=false
+permissions/modify_audio_settings=false
+permissions/modify_phone_state=false
+permissions/mount_format_filesystems=false
+permissions/mount_unmount_filesystems=false
+permissions/nfc=false
+permissions/persistent_activity=false
+permissions/process_outgoing_calls=false
+permissions/read_calendar=false
+permissions/read_call_log=false
+permissions/read_contacts=false
+permissions/read_external_storage=false
+permissions/read_frame_buffer=false
+permissions/read_history_bookmarks=false
+permissions/read_input_state=false
+permissions/read_logs=false
+permissions/read_phone_state=false
+permissions/read_profile=false
+permissions/read_sms=false
+permissions/read_social_stream=false
+permissions/read_sync_settings=false
+permissions/read_sync_stats=false
+permissions/read_user_dictionary=false
+permissions/reboot=false
+permissions/receive_boot_completed=false
+permissions/receive_mms=false
+permissions/receive_sms=false
+permissions/receive_wap_push=false
+permissions/record_audio=false
+permissions/reorder_tasks=false
+permissions/restart_packages=false
+permissions/send_respond_via_message=false
+permissions/send_sms=false
+permissions/set_activity_watcher=false
+permissions/set_alarm=false
+permissions/set_always_finish=false
+permissions/set_animation_scale=false
+permissions/set_debug_app=false
+permissions/set_orientation=false
+permissions/set_pointer_speed=false
+permissions/set_preferred_applications=false
+permissions/set_process_limit=false
+permissions/set_time=false
+permissions/set_time_zone=false
+permissions/set_wallpaper=false
+permissions/set_wallpaper_hints=false
+permissions/signal_persistent_processes=false
+permissions/status_bar=false
+permissions/subscribed_feeds_read=false
+permissions/subscribed_feeds_write=false
+permissions/system_alert_window=false
+permissions/transmit_ir=false
+permissions/uninstall_shortcut=false
+permissions/update_device_stats=false
+permissions/use_credentials=false
+permissions/use_sip=false
+permissions/vibrate=false
+permissions/wake_lock=false
+permissions/write_apn_settings=false
+permissions/write_calendar=false
+permissions/write_call_log=false
+permissions/write_contacts=false
+permissions/write_external_storage=false
+permissions/write_gservices=false
+permissions/write_history_bookmarks=false
+permissions/write_profile=false
+permissions/write_secure_settings=false
+permissions/write_settings=false
+permissions/write_sms=false
+permissions/write_social_stream=false
+permissions/write_sync_settings=false
+permissions/write_user_dictionary=false