Y pl dev

.github/workflows/flutter.yml

@@ -10,31 +10,65 @@ on:
       - main
       - dev
       - dev_dev2
+      - n-search2
+      - ns2new
+      - n-search2.1
+
   pull_request:
     types: [opened, synchronize, reopened]
   workflow_dispatch:
 
 jobs:
   build_windows:
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       - name: Clone repository
-        uses: actions/checkout@v4      
-     
+        uses: actions/checkout@v4
+
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
           channel: stable
           cache: true
 
-      - name: Install Inno Setup
+      # נסה קודם את הסקריפט שלך (אם הוא מטפל בהתקנה/הוספת PATH)
+      - name: Install Inno Setup (project script + fallback)
+        shell: pwsh
         run: |
-          ./installer/install_inno_setup.ps1
+          $ErrorActionPreference = 'Stop'
+
+          # 1) נסיון להריץ את הסקריפט המקומי אם קיים
+          if (Test-Path .\installer\install_inno_setup.ps1) {
+            Write-Host "Running local installer script..."
+            .\installer\install_inno_setup.ps1
+          } else {
+            Write-Host "Local installer script not found, skipping."
+          }
+
+          # 2) אם עדיין אין iscc במערכת - התקנה אמינה דרך winget/Chocolatey
+          if (-not (Get-Command iscc -ErrorAction SilentlyContinue)) {
+            if (Get-Command winget -ErrorAction SilentlyContinue) {
+              Write-Host "Installing Inno Setup via winget..."
+              winget install -e --id JRSoftware.InnoSetup --silent --accept-package-agreements --accept-source-agreements
+            } else {
+              Write-Host "winget not found, installing via Chocolatey..."
+              choco install innosetup -y --no-progress
+            }
+          }
+
+          # 3) מציאת המיקום של ISCC.exe והזרקתו ל־ENV
+          $iscc = (Get-ChildItem "C:\Program Files*\Inno Setup*\ISCC.exe" -Recurse -ErrorAction SilentlyContinue |
+                   Select-Object -First 1 -ExpandProperty FullName)
+          if (-not $iscc) { throw "ISCC.exe not found after installation" }
+
+          "ISCC=$iscc" | Out-File -FilePath $env:GITHUB_ENV -Append
+          Write-Host "ISCC resolved to: $iscc"
 
       - name: Build Flutter Windows app
+        shell: pwsh
         run: |
           flutter build windows --release
-      
+
       - name: Zip Windows build
         shell: pwsh
         run: |
@@ -45,12 +79,16 @@ jobs:
           Compress-Archive -Path "$relDir\runner\Release\*" -DestinationPath otzaria-windows.zip
 
       - name: Build MSIX package
-        run: dart run msix:create --install-certificate false
-
+        shell: pwsh
+        run: |
+          dart run msix:create --install-certificate false
+
       - name: Build Inno Setup installer
+        shell: pwsh
         run: |
-          iscc installer\otzaria.iss
-
+          # שימוש בנתיב המלא/ENV כדי לא להיות תלוי ב-PATH
+          & "$env:ISCC" installer\otzaria.iss
+
       - name: Upload Windows installer
         uses: actions/upload-artifact@v4
         with:
@@ -335,7 +373,7 @@ jobs:
         run: |
           VERSION=$(grep '^version:' pubspec.yaml | cut -d ' ' -f 2 | cut -d '+' -f 1)
           echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "tag=v$VERSION-pr-${{ github.event.number }}-${{ github.run_number }}" >> $GITHUB_OUTPUT
+          echo "tag=$VERSION-pr-${{ github.event.number }}-${{ github.run_number }}" >> $GITHUB_OUTPUT
           echo "title=Otzaria v$VERSION - PR #${{ github.event.number }} Preview" >> $GITHUB_OUTPUT
 
       - name: Get commit message

.github/workflows/release-webhook.yml

@@ -0,0 +1,34 @@
+name: Send Release Webhook
+
+on:
+  release:
+    types: [published]
+
+  workflow_dispatch:  # מאפשר הפעלה ידנית
+
+jobs:
+  send_webhook:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Install dependencies
+        run: pip install bs4 requests pyluach
+
+      - name: Run webhook script
+        env:
+          RELEASE_TAG: ${{ github.event.release.tag_name }}
+          RELEASE_NAME: ${{ github.event.release.name }}
+          RELEASE_BODY: ${{ github.event.release.body }}
+          RELEASE_URL: ${{ github.event.release.html_url }}
+          USER_NAME: ${{ secrets.USER_NAME }}
+          PASSWORD: ${{ secrets.PASSWORD }}
+          TOKEN_YEMOT: ${{ secrets.TOKEN_YEMOT }}
+        run: python webhooks/main.py

.gitignore

@@ -60,7 +60,7 @@ android/
 build/
 fonts/
 
-installer/otzaria-0.2.7-windows.exe
-installer/otzaria-0.2.7-windows-full.exe
+installer/otzaria-0.9.53-windows.exe
+installer/otzaria-0.9.53-windows-full.exe
 pubspec.lock
 flutter/

android/app/build.gradle

@@ -25,8 +25,8 @@ if (flutterVersionName == null) {
 
 android {
     namespace "com.example.otzaria"
-    compileSdkVersion 34
-    ndkVersion flutter.ndkVersion
+    compileSdkVersion 35
+    ndkVersion "27.0.12077973"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
@@ -47,7 +47,7 @@ android {
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 23
-        targetSdkVersion flutter.targetSdkVersion
+        targetSdkVersion 35
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '1.9.25'
     repositories {
         google()
         mavenCentral()
@@ -26,8 +26,8 @@ subprojects {
         if (project.plugins.hasPlugin("com.android.application") ||
                 project.plugins.hasPlugin("com.android.library")) {
             project.android {
-                compileSdkVersion 34
-                buildToolsVersion "34.0.0"
+                compileSdkVersion 35
+                buildToolsVersion "35.0.0"
             }
         }
     }

android/settings.gradle

@@ -23,8 +23,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id("com.android.application") version "8.3.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.0" apply false
+    id("com.android.application") version "8.7.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.25" apply false
 }
 
 include ":app"