Merge pull request #197 from camarm-dev/dev

Version 1.3.0-beta

.github/workflows/build.desktop.yml

@@ -0,0 +1,127 @@
+name: 'Build Remède desktop applications'
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  publish-tauri:
+    permissions:
+      contents: write
+    strategy:
+      max-parallel: 1
+      fail-fast: false
+      matrix:
+        include:
+          - platform: 'macos-latest' # for Arm based macs (M1 and above).
+            args: '--target aarch64-apple-darwin'
+          - platform: 'macos-latest' # for Intel based macs.
+            args: '--target x86_64-apple-darwin'
+          - platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.04.
+            args: ''
+          - platform: 'windows-latest'
+            args: ''
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies (ubuntu only)
+        if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+        # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
+
+        # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: 'npm' # Set this to npm, yarn or pnpm.
+          cache-dependency-path: app/package-lock.json
+
+      - name: Install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
+          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: './src-tauri -> target'
+
+      - name: Install frontend dependencies
+        # If you don't have `beforeBuildCommand` configured you may want to build your frontend here too.
+        working-directory: ./app
+        run: npm install # change this to npm or pnpm depending on which one you use.
+
+      # Additional windows configuration options
+      - uses: actions/setup-python@v5
+        if: matrix.platform == 'windows-latest'
+        with:
+          python-version: '3.10'
+      - name: Make configuration changes for windows
+        if: matrix.platform == 'windows-latest'
+        run: |
+          python app/src-tauri/windows_conf.py
+
+      - uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tagName: __VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
+          releaseName: '__VERSION__'
+          releaseBody: '## `__VERSION__`: Unknown Codename
+          Quick description...
+          ## Associated issues
+          - [ ]
+          '
+          releaseDraft: true
+          prerelease: false
+          projectPath: ./app
+          args: ${{ matrix.args }}
+
+      - name: Copy DEB binary
+        if: matrix.platform == 'ubuntu-22.04'
+        run: cp /home/runner/work/remede/remede/app/src-tauri/target/release/bundle/deb/*.deb /home/runner/work/remede/remede/builds/remede.deb
+
+      - name: Copy x64 DMG binary
+        if: matrix.platform == 'macos-latest' && matrix.args == '--target x86_64-apple-darwin'
+        run: |
+          cp /Users/runner/work/remede/remede/app/src-tauri/target/x86_64-apple-darwin/release/bundle/macos/*.app.tar.gz  /Users/runner/work/remede/remede/builds/remede.x64.app.tar.gz
+          cp /Users/runner/work/remede/remede/app/src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg  /Users/runner/work/remede/remede/builds/remede.x64.dmg
+
+      - name: Copy aarch64 DMG binary
+        if: matrix.platform == 'macos-latest' && matrix.args == '--target aarch64-apple-darwin'
+        run: |
+          cp /Users/runner/work/remede/remede/app/src-tauri/target/aarch64-apple-darwin/release/bundle/macos/*.app.tar.gz  /Users/runner/work/remede/remede/builds/remede.aarch64.app.tar.gz
+          cp /Users/runner/work/remede/remede/app/src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg  /Users/runner/work/remede/remede/builds/remede.aarch64.dmg
+
+#      - name: Copy MSI binary
+#        if: matrix.platform == 'windows-latest'
+#        run: |
+#          Copy-Item -Path "D:\a\remede\remede\app\src-tauri\target\release\bundle\nsis\*" -Destination "D:\a\remede\remede\builds" -Include *.msi
+#          Copy-Item -Path "D:\a\remede\remede\app\src-tauri\target\release\bundle\nsis\*" -Destination "D:\a\remede\remede\builds" -Include *.exe
+#          git restore app/package.json
+#          git restore app/src-tauri/Cargo.toml
+
+      - name: Commit changes
+        if: matrix.platform != 'windows-latest'
+        run: |
+          git config --local user.name actions-user
+          git config --local user.email "[email protected]"
+          git config pull.rebase true
+          git add builds/*
+          git commit -m "chore(binaries): added latest Remède binaries"
+          git pull
+
+      - name: Push changes # push the output folder to your repo
+        if: matrix.platform != 'windows-latest'
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          force: true
+          branch: 'dev'

.github/workflows/checks.yml

@@ -0,0 +1,64 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# ESLint is a tool for identifying and reporting on patterns
+# found in ECMAScript/JavaScript code.
+# More details at https://github.com/eslint/eslint
+# and https://eslint.org
+
+name: Checks
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+
+jobs:
+  eslint:
+    name: Eslint scanning
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      security-events: write
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Environnement
+        run: cd app && npm install
+
+      - name: Run ESLint
+        run: cd app && npm run lint
+  build:
+    name: Building Vue project
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      security-events: write
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Environnement
+        run: cd app && npm install
+
+      - name: Build code
+        run: cd app && npm run build
+  generation:
+    name: Ressources generation (wordlist, IPA list)
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      security-events: write
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Run ressources generation
+        run: python3 scripts/pre_generate_ressources.py

CITATIONS.cff

@@ -3,8 +3,8 @@
 cff-version: "1.2.0"
 message: "If you use this software, or part of this one, please cite it using these metadata."
 identifiers:
-	- type: doi
-	- value: '10.5281/zenodo.10546995'
+  - type: doi
+    value: 10.5281/zenodo.10546995
 title: "Remède - French open source dictionary"
 authors:
   -
@@ -15,6 +15,6 @@ authors:
 abstract: "Remède is a french dictionary database, API and mobile application. It's an open source alternative to Antidote."
 repository-code: "https://github.com/camarm-dev/remede"
 license: CECILL-2.1
-version: 1.1.5
-date-released: '2024-03-31'
+version: 1.3.0
+date-released: '2024-08-01'
 ...

README.md

@@ -29,14 +29,13 @@ Remède is a dictionary, which can replace any proprietary dictionary, with thes
 - [Documentation](#documentation)
 - [Screenshots](#screenshots)
 
-## Current: 1.2.0-beta — Brown Sheep
-
-La version `1.2.0`, nom de code `Brown Sheep` inclue les nouvelles fonctionnalités suivantes :
-- [x] Dictionnaire de **rimes**
-- [x] Nouvelle navigation **encore plus agréable**.
-- [x] Actions natives quand **un mot est sélectionné** n'importe où dans votre téléphone !
-- [x] Widget pour un accès **plus rapide**.
-- [x] **Base révisée** avec +340 000 mots !
+## Current: 1.3.0-beta — Phenomenal Feather
+
+La version `1.3.0`, nom de code `Phenomenal Feather` inclue les nouvelles fonctionnalités suivantes :
+- [x] Application traduite en anglais
+- [ ] Nouvelle structure de données
+- [ ] Applications de bureau
+- [ ] **Base révisée** avec +900 000 mots !
 - [ ] Téléchargeable sur le **Play Store** !
 
 ## Télécharger

app/android/app/build.gradle

@@ -5,14 +5,14 @@ android {
     buildFeatures {
         viewBinding true
     }
-    namespace "com.camarm.remede"
+    namespace "dev.camarm.remede"
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "com.camarm.remede"
+        applicationId "dev.camarm.remede"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 123
-        versionName '1.2.3 — Brown Sheep, revison 3'
+        versionCode 124
+        versionName '1.3.0-beta — Phenomenal Feather, Beta'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

app/android/app/capacitor.build.gradle

@@ -11,6 +11,7 @@ apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-app')
     implementation project(':capacitor-clipboard')
+    implementation project(':capacitor-device')
     implementation project(':capacitor-filesystem')
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')

app/android/app/release/output-metadata.json

@@ -4,17 +4,17 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "com.camarm.remede",
+  "applicationId": "dev.camarm.remede",
   "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 122,
-      "versionName": "1.2.2 — Brown Sheep, revison 2",
+      "versionCode": 124,
+      "versionName": "1.3.0-beta — Phenomenal Feather, Beta",
       "outputFile": "app-release.apk"
     }
   ],
   "elementType": "File"
-}
+}