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
107 changes: 54 additions & 53 deletions .github/workflows/flutter-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ jobs:
name: Linux & Android
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
- uses: subosito/flutter-action@v2.16.0
distribution: "zulu"
java-version: "21"
- uses: subosito/flutter-action@v2.21.0
with:
channel: 'stable'
flutter-version: '3.22.x'
channel: "stable"
flutter-version: "3.32.x"
- name: Install dependencies
run: |
sudo apt-get update -y
Expand All @@ -31,17 +31,18 @@ jobs:
mkdir android/.keystore
echo "${{ secrets.ANDROID_KEYSTORE }}" | base64 --decode > android/.keystore/upload-keystore.jks
echo "${{ secrets.ANDROID_KEY_PROPERTIES }}" | base64 --decode > android/key.properties
yes | flutter doctor --android-licenses
flutter build apk
flutter build appbundle
cp build/app/outputs/flutter-apk/app-release.apk thingset-app_${{github.ref_name}}.apk
cp build/app/outputs/bundle/release/app-release.aab thingset-app_${{github.ref_name}}.aab
- name: Upload Linux artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: thingset-app-linux
path: build/linux/x64/release/bundle/*
- name: Upload Android artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: thingset-app-android
path: |
Expand All @@ -62,70 +63,70 @@ jobs:
name: Windows
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: subosito/flutter-action@v2.16.0
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2.21.0
with:
channel: 'stable'
flutter-version: '3.22.x'
channel: "stable"
flutter-version: "3.32.x"
- name: Install dependencies
run: flutter pub get
- name: Build Windows app
run: |
flutter config --enable-windows-desktop
flutter build windows --release
- name: Upload Windows artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: thingset-app-windows
path: build/windows/x64/runner/Release/*
- name: Archive release
uses: thedoctor0/zip-release@master
with:
type: 'zip'
type: "zip"
filename: thingset-app_${{github.ref_name}}-windows.zip
directory: build/windows/x64/runner/Release
- name: Upload release files
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: build/windows/x64/runner/Release/thingset-app_${{github.ref_name}}-windows.zip

# macos-ios:
# name: macOS & iOS
# runs-on: macos-latest
# steps:
# - uses: actions/checkout@v3
# - uses: subosito/flutter-action@v2
# with:
# channel: 'stable'
# flutter-version: '3.22.x'
# architecture: x64
# - name: Install dependencies
# run: flutter pub get
# - name: Build macOS app
# run: |
# flutter config --enable-macos-desktop
# flutter build macos --release
# - name: Build iOS app
# run: |
# flutter build ios --release --no-codesign
# - name: Upload macOS artifacts
# uses: actions/upload-artifact@v3
# with:
# name: thingset-app-macos
# path: build/macos/Build/Products/Release/*
# - name: Archive Release
# uses: thedoctor0/zip-release@master
# with:
# type: 'zip'
# filename: thingset-app_${{github.ref_name}}-macos.zip
# directory: build/macos/Build/Products/Release
# - name: macOS Release
# uses: softprops/action-gh-release@v1
# if: startsWith(github.ref, 'refs/tags/')
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# files: build/macos/Build/Products/Release/thingset-app_${{github.ref_name}}-macos.zip
macos-ios:
name: iOS
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2.21.0
with:
channel: "stable"
flutter-version: "3.32.x"
architecture: x64
- name: Install dependencies
run: flutter pub get
# - name: Build macOS app
# run: |
# flutter config --enable-macos-desktop
# flutter build macos --release
- name: Build iOS app
run: |
flutter build ios --release --no-codesign
# - name: Upload macOS artifacts
# uses: actions/upload-artifact@v4
# with:
# name: thingset-app-macos
# path: build/macos/Build/Products/Release/*
# - name: Archive Release
# uses: thedoctor0/zip-release@master
# with:
# type: "zip"
# filename: thingset-app_${{github.ref_name}}-macos.zip
# directory: build/macos/Build/Products/Release
# - name: macOS Release
# uses: softprops/action-gh-release@v2
# if: startsWith(github.ref, 'refs/tags/')
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# files: build/macos/Build/Products/Release/thingset-app_${{github.ref_name}}-macos.zip
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
*.swp
.DS_Store
.atom/
.build/
.buildlog/
.history
.svn/
.swiftpm/
migrate_working_dir/

# IntelliJ related
Expand All @@ -27,7 +29,6 @@ migrate_working_dir/
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
.packages
.pub-cache/
.pub/
/build/
Expand Down
34 changes: 17 additions & 17 deletions .metadata
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled.
# This file should be version controlled and should not be manually edited.

version:
revision: d9111f64021372856901a1fd5bfbc386cade3318
channel: stable
revision: "fcf2c11572af6f390246c056bc905eca609533a0"
channel: "stable"

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: d9111f64021372856901a1fd5bfbc386cade3318
base_revision: d9111f64021372856901a1fd5bfbc386cade3318
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
- platform: android
create_revision: d9111f64021372856901a1fd5bfbc386cade3318
base_revision: d9111f64021372856901a1fd5bfbc386cade3318
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
- platform: ios
create_revision: d9111f64021372856901a1fd5bfbc386cade3318
base_revision: d9111f64021372856901a1fd5bfbc386cade3318
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
- platform: linux
create_revision: d9111f64021372856901a1fd5bfbc386cade3318
base_revision: d9111f64021372856901a1fd5bfbc386cade3318
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
- platform: macos
create_revision: d9111f64021372856901a1fd5bfbc386cade3318
base_revision: d9111f64021372856901a1fd5bfbc386cade3318
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
- platform: web
create_revision: d9111f64021372856901a1fd5bfbc386cade3318
base_revision: d9111f64021372856901a1fd5bfbc386cade3318
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
base_revision: fcf2c11572af6f390246c056bc905eca609533a0
- platform: windows
create_revision: d9111f64021372856901a1fd5bfbc386cade3318
base_revision: d9111f64021372856901a1fd5bfbc386cade3318
create_revision: fcf2c11572af6f390246c056bc905eca609533a0
base_revision: fcf2c11572af6f390246c056bc905eca609533a0

# User provided section

Expand Down
9 changes: 2 additions & 7 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ linter:
# The lint rules applied to this project can be customized in the
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
# included above or to enable additional rules. A list of all available lints
# and their documentation is published at
# https://dart-lang.github.io/linter/lints/index.html.
# and their documentation is published at https://dart.dev/lints.
#
# Instead of disabling a lint rule for the entire project in the
# section below, it can also be suppressed for a single line of code
Expand All @@ -23,11 +22,7 @@ linter:
# producing the lint.
rules:
# avoid_print: false # Uncomment to disable the `avoid_print` rule
prefer_single_quotes: true
always_declare_return_types: true
sort_child_properties_last: true
unawaited_futures: true
use_full_hex_values_for_flutter_colors: true
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule

# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options
3 changes: 2 additions & 1 deletion android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ gradle-wrapper.jar
/gradlew.bat
/local.properties
GeneratedPluginRegistrant.java
.cxx/

# Remember to never publicly share your keystore.
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
# See https://flutter.dev/to/reference-keystore
key.properties
**/*.keystore
**/*.jks
83 changes: 0 additions & 83 deletions android/app/build.gradle

This file was deleted.

Loading