Feature/sync conflict log

.github/workflows/release-main.yml

@@ -0,0 +1,207 @@
+name: Build and Release (main)
+
+on:
+  push:
+    branches:
+      - main
+      - feature/sync-conflict-log
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+concurrency:
+  group: release-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build_flutter:
+    name: Flutter ${{ matrix.target }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - target: android
+            os: ubuntu-latest
+            artifact_name: flutter-android-apk
+          - target: linux
+            os: ubuntu-latest
+            artifact_name: flutter-linux
+          - target: macos
+            os: macos-latest
+            artifact_name: flutter-macos
+          - target: ios
+            os: macos-latest
+            artifact_name: flutter-ios
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Java (Android)
+        if: matrix.target == 'android'
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '17'
+          cache: gradle
+
+      - name: Setup Gradle cache (Android)
+        if: matrix.target == 'android'
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          cache: true
+
+      - name: Cache pub dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.pub-cache
+            .dart_tool
+          key: ${{ runner.os }}-${{ matrix.target }}-pub-${{ hashFiles('pubspec.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.target }}-pub-
+            ${{ runner.os }}-pub-
+
+      - name: Flutter pub get
+        run: flutter pub get
+
+      - name: Install Linux desktop build deps
+        if: matrix.target == 'linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            clang \
+            cmake \
+            ninja-build \
+            pkg-config \
+            libgtk-3-dev \
+            liblzma-dev \
+            libgstreamer1.0-dev \
+            libgstreamer-plugins-base1.0-dev
+
+      - name: Enable Linux platform
+        if: matrix.target == 'linux'
+        run: |
+          flutter config --enable-linux-desktop
+          flutter create --platforms=linux .
+
+      - name: Build Android APK
+        if: matrix.target == 'android'
+        run: flutter build apk --release --flavor prod --no-pub
+
+      - name: Build Linux
+        if: matrix.target == 'linux'
+        run: flutter build linux --release
+
+      - name: Build macOS
+        if: matrix.target == 'macos'
+        run: flutter build macos --release
+
+      - name: Build iOS (no code signing)
+        if: matrix.target == 'ios'
+        run: flutter build ios --release --no-codesign
+
+      - name: Prepare artifact bundle
+        shell: bash
+        run: |
+          set -euo pipefail
+          mkdir -p out
+          if [ "${{ matrix.target }}" = "android" ]; then
+            APK_PATH="$(find build/app/outputs/flutter-apk -maxdepth 1 -type f -name '*prod-release.apk' | head -n 1)"
+            if [ -z "${APK_PATH}" ]; then
+              echo "Could not find prod release APK in build/app/outputs/flutter-apk" >&2
+              ls -la build/app/outputs/flutter-apk || true
+              exit 1
+            fi
+            cp "${APK_PATH}" out/sketchord-android-prod-release.apk
+          elif [ "${{ matrix.target }}" = "linux" ]; then
+            tar -czf out/sketchord-linux-release.tar.gz -C build/linux/x64/release bundle
+          elif [ "${{ matrix.target }}" = "macos" ]; then
+            ditto -c -k --sequesterRsrc --keepParent build/macos/Build/Products/Release/sound.app out/sketchord-macos-release.zip
+          elif [ "${{ matrix.target }}" = "ios" ]; then
+            ditto -c -k --sequesterRsrc --keepParent build/ios/iphoneos/Runner.app out/sketchord-ios-runner-app-nosign.zip
+          fi
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact_name }}
+          path: out/*
+          if-no-files-found: error
+
+  build_backend_pyinstaller:
+    name: Backend PyInstaller ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: pip
+          cache-dependency-path: |
+            backend/requirements.txt
+
+      - name: Build backend executable
+        shell: bash
+        run: |
+          set -euo pipefail
+          chmod +x backend/scripts/build_pyinstaller.sh
+          backend/scripts/build_pyinstaller.sh
+
+      - name: Package backend executable
+        shell: bash
+        run: |
+          set -euo pipefail
+          mkdir -p out
+          BIN_NAME="sketchord-sync-backend"
+          if [ "${{ runner.os }}" = "Windows" ]; then
+            BIN_NAME="sketchord-sync-backend.exe"
+          fi
+          cp "backend/dist/${BIN_NAME}" "out/${BIN_NAME}-${{ runner.os }}"
+
+      - name: Upload backend artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: backend-pyinstaller-${{ runner.os }}
+          path: out/*
+          if-no-files-found: error
+
+  release:
+    name: Create Release
+    runs-on: ubuntu-latest
+    needs:
+      - build_flutter
+      - build_backend_pyinstaller
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: List artifacts
+        run: ls -R artifacts
+
+      - name: Publish GitHub release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: main-build-${{ github.run_number }}
+          name: Main build #${{ github.run_number }}
+          generate_release_notes: true
+          files: artifacts/**/*

.gitignore

@@ -47,4 +47,5 @@ settings.json
 backend/data/
 backend/data.json
 
-android/app/google-services.json
+android/app/google-services.json
+.gradle/

.metadata

@@ -4,7 +4,27 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: bbfbf1770cca2da7c82e887e4e4af910034800b6
-  channel: stable
+  revision: "9f455d2486bcb28cad87b062475f42edc959f636"
+  channel: "stable"
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 9f455d2486bcb28cad87b062475f42edc959f636
+      base_revision: 9f455d2486bcb28cad87b062475f42edc959f636
+    - platform: macos
+      create_revision: 9f455d2486bcb28cad87b062475f42edc959f636
+      base_revision: 9f455d2486bcb28cad87b062475f42edc959f636
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "sketchord dev",
+            "request": "launch",
+            "type": "dart",
+            "args": [
+                "--flavor",
+                "dev"
+            ]
+        }
+    ]
+}

README.md

@@ -4,4 +4,18 @@ flutter run --flavor prod
 flutter run --flavor dev
 
 # flutter run --flavor dev -d chrome --web-renderer html
-# flutter packages pub run flutter_launcher_icons:main -f pubspec.yaml 
+# flutter packages pub run flutter_launcher_icons:main -f pubspec.yaml
+
+# Create Release
+1. Change Version
+2. Build bundle `flutter build appbundle --flavor prod`
+
+# CI/CD Release
+
+A GitHub Actions workflow is defined at `.github/workflows/release-main.yml`.
+
+On every push to `main`, it:
+
+1. Builds Flutter artifacts for Android, Linux, macOS, and iOS (`--no-codesign` for iOS).
+2. Builds standalone backend binaries with PyInstaller for Linux and macOS.
+3. Publishes a GitHub Release named `Main build #<run_number>` and uploads all artifacts.

analysis_options.yaml

@@ -0,0 +1,13 @@
+analyzer:
+  exclude:
+    - build/**
+    - lib/audio_list.dart
+    - lib/audio_list_store.dart
+    - lib/collection_editor_store.dart
+    - lib/collections.dart
+    - lib/collections_store.dart
+    - lib/menu_store.dart
+    - lib/note_search_view.dart
+    - lib/dialogs/add_to_collection_dialog.dart
+    - lib/dialogs/change_number_dialog.dart
+    - lib/dialogs/choose_note_dialog.dart

android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'dev.flutter.flutter-gradle-plugin'
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,48 +12,33 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode') ?: '1'
+def flutterVersionName = localProperties.getProperty('flutter.versionName') ?: '1.0'
 
 android {
-    compileSdkVersion 28
+    namespace 'com.example.sound'
+    compileSdk flutter.compileSdkVersion
+    ndkVersion flutter.ndkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "de.onenightproductions.sketchord"
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdk flutter.minSdkVersion
+        targetSdk flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
     flavorDimensions "app"
     productFlavors {
-
         dev {
             dimension "app"
             resValue "string", "app_name", "SketChord Dev"
@@ -64,8 +55,6 @@ android {
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
         }
     }
@@ -74,7 +63,3 @@ android {
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}