Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 71 additions & 71 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ jobs:
name: bonfire-android
path: bonfire/build/app/outputs/flutter-apk/app-release.apk

- name: Build Android App Bundle
run: flutter build appbundle --no-tree-shake-icons -v

- name: Upload App Bundle
uses: actions/upload-artifact@v4
with:
name: bonfire-android-bundle
path: bonfire/build/app/outputs/bundle/release/app-release.aab
# - name: Build Android App Bundle
# run: flutter build appbundle --no-tree-shake-icons -v
#
# - name: Upload App Bundle
# uses: actions/upload-artifact@v4
# with:
# name: bonfire-android-bundle
# path: bonfire/build/app/outputs/bundle/release/app-release.aab

build-windows:
runs-on: windows-latest
Expand Down Expand Up @@ -167,66 +167,66 @@ jobs:
with:
name: bonfire-linux
path: bonfire/build/linux/x64/release/bundle/
build-ios:
runs-on: macos-latest
steps:
- name: Clone repository
uses: actions/checkout@v2
with:
submodules: recursive

- name: Set up Java 17
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'adopt'

- name: Set up Flutter
uses: subosito/flutter-action@v2
with:
channel: stable

- name: Install dependencies
run: flutter pub get

- name: Setup Ruby for Fastlane
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
bundler-cache: true

- name: Build iOS
run: |
flutter build ios --release --no-tree-shake-icons --no-codesign -v

- name: Archive iOS build artifacts
run: |
cd bonfire/ios
xcodebuild -workspace Runner.xcworkspace \
-scheme Runner \
-configuration Release \
-archivePath build/Runner.xcarchive \
archive \
-allowProvisioningUpdates \
CODE_SIGN_IDENTITY="" \
CODE_SIGNING_REQUIRED=NO \
CODE_SIGNING_ALLOWED=NO

- name: Create IPA file
working-directory: ./ios
run: |
mkdir -p Payload
cp -R build/Runner.xcarchive/Products/Applications/Runner.app Payload
zip -r app.ipa Payload

- name: Upload IPA
uses: actions/upload-artifact@v4
with:
name: bonfire-ios
path: bonfire/ios/app.ipa

- name: Upload Archive
uses: actions/upload-artifact@v4
with:
name: bonfire-ios-archive
path: bonfire/ios/build/Runner.xcarchive
# build-ios:
# runs-on: macos-latest
# steps:
# - name: Clone repository
# uses: actions/checkout@v2
# with:
# submodules: recursive
#
# - name: Set up Java 17
# uses: actions/setup-java@v2
# with:
# java-version: '17'
# distribution: 'adopt'
#
# - name: Set up Flutter
# uses: subosito/flutter-action@v2
# with:
# channel: stable
#
# - name: Install dependencies
# run: flutter pub get
#
# - name: Setup Ruby for Fastlane
# uses: ruby/setup-ruby@v1
# with:
# ruby-version: '3.0'
# bundler-cache: true
#
# - name: Build iOS
# run: |
# flutter build ios --release --no-tree-shake-icons --no-codesign -v
#
# - name: Archive iOS build artifacts
# run: |
# cd bonfire/ios
# xcodebuild -workspace Runner.xcworkspace \
# -scheme Runner \
# -configuration Release \
# -archivePath build/Runner.xcarchive \
# archive \
# -allowProvisioningUpdates \
# CODE_SIGN_IDENTITY="" \
# CODE_SIGNING_REQUIRED=NO \
# CODE_SIGNING_ALLOWED=NO
#
# - name: Create IPA file
# working-directory: ./ios
# run: |
# mkdir -p Payload
# cp -R build/Runner.xcarchive/Products/Applications/Runner.app Payload
# zip -r app.ipa Payload
#
# - name: Upload IPA
# uses: actions/upload-artifact@v4
# with:
# name: bonfire-ios
# path: bonfire/ios/app.ipa
#
# - name: Upload Archive
# uses: actions/upload-artifact@v4
# with:
# name: bonfire-ios-archive
# path: bonfire/ios/build/Runner.xcarchive
11 changes: 4 additions & 7 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ plugins {
}

android {
namespace = "com.example.bonfire"
namespace = "org.openbonfire.bonfire"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion
ndkVersion "25.2.9519653"

compileOptions {
coreLibraryDesugaringEnabled true
Expand All @@ -24,10 +24,7 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "com.example.bonfire"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
applicationId = "org.openbonfire.bonfire"
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
Expand All @@ -44,7 +41,7 @@ android {
}

dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
}

flutter {
Expand Down
2 changes: 1 addition & 1 deletion android/app/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"client_info": {
"mobilesdk_app_id": "1:162066849712:android:db38e83be74de1b6",
"android_client_info": {
"package_name": "com.example.bonfire"
"package_name": "org.openbonfire.bonfire"
}
},
"oauth_client": [],
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
4 changes: 2 additions & 2 deletions android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.3.2" apply false
id "com.android.application" version "8.9.1" apply false
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.3.15" apply false
// END: FlutterFire Configuration
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
id "org.jetbrains.kotlin.android" version "2.3.0" apply false
}

include ":app"
Loading