[DRAFT PR - DO NOT MERGE] Features add, bugs fixes & ajout d'EcoleDirecte partie 4

.eslintrc.js

@@ -17,6 +17,9 @@ module.exports = {
  'vue/no-deprecated-slot-attribute': 'off',
  '@typescript-eslint/no-explicit-any': 'off',
  '@typescript-eslint/no-var-requires': 0,
+ "prefer-const": 0,
+ "no-var": 0,
+ "vue/no-reserved-component-names": 0
  },
  overrides: [
  {

.github/workflows/app_deployment.yml

@@ -5,6 +5,12 @@ on:
  branches:
  - master
  - beta
+ workflow_dispatch:
+ inputs:
+ deploy_type:
+ description: 'Type of deployment'
+ required: true
+ default: 'alpha'
 
 jobs:
  initialize:
@@ -32,7 +38,7 @@ jobs:
  - name: Setup Node.js
  uses: actions/setup-node@v3
  with:
- node-version: 16
+ node-version: 20
  cache: npm
 
  - name: Get deploy type
@@ -54,6 +60,7 @@ jobs:
 
 
  deploy_android:
+ if: ${{ inputs.deploy_type != 'alpha' }}
  needs: initialize
  runs-on: macos-latest
  steps:
@@ -96,7 +103,7 @@ jobs:
  - name: Setup Node.js
  uses: actions/setup-node@v3
  with:
- node-version: 16
+ node-version: 20
  cache: npm
 
  - name: Setup dependencies
@@ -173,6 +180,7 @@ jobs:
 
 
  deploy_ios:
+ if: ${{ inputs.deploy_type != 'alpha' }}
  needs: initialize
  runs-on: macos-latest
  steps:
@@ -184,7 +192,7 @@ jobs:
  - name: Setup Node.js
  uses: actions/setup-node@v3
  with:
- node-version: 16
+ node-version: 20
  cache: npm
 
  - name: Init XCode SDK
@@ -301,6 +309,7 @@ jobs:
 
 
  summary_and_release:
+ if: ${{ inputs.deploy_type != 'alpha' }}
  needs: [initialize, deploy_android, deploy_ios]
  runs-on: macos-latest
  steps:
@@ -369,4 +378,116 @@ jobs:
  echo "" >> $GITHUB_STEP_SUMMARY
  echo "---" >> $GITHUB_STEP_SUMMARY
  echo "Fin de rapport de déploiement" >> $GITHUB_STEP_SUMMARY
- echo "(c) 2023 - PapillonApp" >> $GITHUB_STEP_SUMMARY
+ echo "(c) 2023 - PapillonApp" >> $GITHUB_STEP_SUMMARY
+
+ deploy_alpha:
+ if: ${{ inputs.deploy_type == 'alpha' }}
+ needs: initialize
+ runs-on: macos-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+
+ - name: Setup Java
+ run: |
+ brew tap AdoptOpenJDK/openjdk
+ brew install --cask adoptopenjdk15
+
+ echo "JAVA_HOME=$(/usr/libexec/java_home -v 15)" >> $GITHUB_ENV
+ echo ${{ env.JAVA_HOME }}
+ java -version
+
+ - name: Setup Android CLI
+ run: |
+ brew install --cask android-commandlinetools
+ sdkmanager --update
+ set +o pipefail
+
+ yes | sdkmanager --licenses
+ yes | sdkmanager --install "platform-tools"
+ yes | sdkmanager --install "build-tools;33.0.1"
+ yes | sdkmanager --install "platforms;android-33"
+
+ sdkmanager --list_installed
+ set -o pipefail
+
+ - name: Setup Android Builder
+ run: |
+ echo "ANDROID_HOME=$(brew --prefix)/share/android-commandlinetools" >> $GITHUB_ENV
+ echo "ANDROID_SDK_ROOT=$(brew --prefix)/share/android-commandlinetools" >> $GITHUB_ENV
+ echo "APP_VERSION_CODE=${{ needs.initialize.outputs.VERSION_CODE }}" >> $GITHUB_ENV
+ echo "APP_VERSION_NUMBER=${{ needs.initialize.outputs.VERSION_NUMBER }}" >> $GITHUB_ENV
+ chmod +x ./android/gradlew;
+
+ - name: Setup Node.js
+ uses: actions/setup-node@v3
+ with:
+ node-version: 20
+ cache: npm
+
+ - name: Setup dependencies
+ run: |
+ npm i -g @ionic/cli
+ npm i --prefer-offline --no-audit
+
+ - name: Update release canal
+ uses: maxgfr/github-change-json@main
+ with:
+ path: "package.json"
+ key: "canal"
+ value: ${{ needs.initialize.outputs.DEPLOY_TYPE }}
+
+ - name: Update version number
+ uses: maxgfr/github-change-json@main
+ with:
+ path: "package.json"
+ key: "version"
+ value: ${{ needs.initialize.outputs.VERSION_NUMBER }}
+
+ - name: Ionic Capacitor Sync
+ run: |
+ ionic capacitor sync android --prod
+
+ - name: Setup Ruby
+ uses: ruby/setup-ruby@v1
+ with:
+ ruby-version: 2.7.2
+ bundler-cache: true
+
+ - name: Cache bundle dependencies
+ uses: actions/cache@v2
+ with:
+ path: vendor/bundle
+ key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+ restore-keys: ${{ runner.os }}-gems-
+
+ - name: Decrypt Android keys
+ run: sh ./.github/scripts/decrypt_android_keys.sh
+ env:
+ KEYS_SECRET_PASSPHRASE: ${{ secrets.KEYS_SECRET_PASSPHRASE }} 
+
+ - name: Export Data to Fastlane
+ run: |
+ echo "KEY_STORE=$GITHUB_WORKSPACE/android/fastlane/logi12-prnplus.jks" >> $GITHUB_ENV
+ echo "KEY_STORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD}}" >> $GITHUB_ENV
+ echo "KEY_ALIAS=${{ secrets.KEY_ALIAS }}" >> $GITHUB_ENV
+ echo "KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> $GITHUB_ENV
+ echo "PLAY_CREDENTIALS_JSON=$GITHUB_WORKSPACE/android/fastlane/play_store.json" >> $GITHUB_ENV
+ echo "GRADLE_FILE=$GITHUB_WORKSPACE/android/app/build.gradle" >> $GITHUB_ENV
+
+ - name: Download bundle dependencies
+ run: |
+ gem install bundler:2.0.2
+ bundle config path vendor/bundle
+ bundle install
+ bundle exec gem install "fastlane-plugin-versioning_android"
+ working-directory: android/fastlane
+
+ - name: Build and deploy
+ run: |
+ echo "LC_ALL=fr_FR.UTF-8" >> $GITHUB_ENV
+ echo "LANG=fr_FR.UTF-8" >> $GITHUB_ENV
+ bundle exec fastlane alpha
+ working-directory: android/fastlane

README.md

@@ -98,21 +98,21 @@ To get a local copy up and running follow these simple steps.
 First, grab a copy of this repo and install the needed dependencies to run Papillon locally.
 
 ```sh
-npm install -g @ionic/cli
 npm i
 ```
 
 ### Installation
-
+*PS: In an older version of this file, you had to install the `@ionic/cli` package. This package is no longer needed, and if you installed it only for Papillon, you can remove it with `npm uninstall -g @ionic/cli`.*
+*We removed it to fix a bug with "Waiting for connectivity with vue-cli-service" message which was CPU intensive.*
 To run papillon, simply run
 ```sh
-ionic serve
+npm run serve
 ```
 
 To build papillon, you need **Android Studio** or *Xcode** installed.
 Android SDK or Xcode command line tools needs to be configured. All the prerequisites for building are available on https://capacitorjs.com/docs/getting-started/environment-setup
 ```sh
-ionic build
+npm run build
 npx cap sync
 # then build using Android Studio or Xcode
 ```

android/app/build.gradle

@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
+ namespace "plus.pronote.app"
  compileSdkVersion rootProject.ext.compileSdkVersion
  defaultConfig {
  applicationId "plus.pronote.app"
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 1000
- versionName "5.0.15"
+ versionCode 1885
+ versionName '5.8.2'
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  aaptOptions {
  // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/capacitor.build.gradle

@@ -2,8 +2,8 @@
 
 android {
  compileOptions {
- sourceCompatibility JavaVersion.VERSION_11
- targetCompatibility JavaVersion.VERSION_11
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
  }
 }
 
@@ -28,7 +28,7 @@ dependencies {
  implementation project(':capacitor-status-bar')
  implementation project(':capacitor-toast')
  implementation project(':capawesome-capacitor-file-picker')
- implementation project(':hugotomazi-capacitor-navigation-bar')
+ implementation project(':mauricewegner-capacitor-navigation-bar')
  implementation project(':transistorsoft-capacitor-background-fetch')
  implementation project(':capacitor-android-shortcuts')
  implementation project(':capacitor-calendar')

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="plus.pronote.app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
  <application
  android:enableOnBackInvokedCallback="true"
  android:allowBackup="true"

android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
  mavenCentral()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:7.3.1'
- classpath 'com.google.gms:google-services:4.3.13'
+ classpath 'com.android.tools.build:gradle:8.0.0'
+ classpath 'com.google.gms:google-services:4.3.15'
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files

android/capacitor.settings.gradle

@@ -59,8 +59,8 @@ project(':capacitor-toast').projectDir = new File('../node_modules/@capacitor/to
 include ':capawesome-capacitor-file-picker'
 project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android')
 
-include ':hugotomazi-capacitor-navigation-bar'
-project(':hugotomazi-capacitor-navigation-bar').projectDir = new File('../node_modules/@hugotomazi/capacitor-navigation-bar/android')
+include ':mauricewegner-capacitor-navigation-bar'
+project(':mauricewegner-capacitor-navigation-bar').projectDir = new File('../node_modules/@mauricewegner/capacitor-navigation-bar/android')
 
 include ':transistorsoft-capacitor-background-fetch'
 project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../node_modules/@transistorsoft/capacitor-background-fetch/android')

android/fastlane/Fastfile

@@ -77,6 +77,23 @@ begin
  )
  end
 
+ lane :alpha do
+ build()
+
+ supply(
+ track: 'alpha',
+ package_name: ENV['APP_PACKAGE_NAME'],
+ version_code: ENV['APP_VERSION_CODE'],
+ release_status: "draft",
+ aab: "#{AAB_LOCATION}",
+ skip_upload_images: true,
+ skip_upload_metadata: true,
+ skip_upload_changelogs: true,
+ skip_upload_screenshots: true,
+ skip_upload_apk: true,
+ json_key: ENV['PLAY_CREDENTIALS_JSON']
+ )
+
  lane :test do
  desc("Build and deploy for test (Android) | It doesn't send app to play store")
 

android/gradle.properties

@@ -20,5 +20,4 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/variables.gradle

@@ -2,15 +2,15 @@ ext {
  minSdkVersion = 22
  compileSdkVersion = 33
  targetSdkVersion = 33
- androidxActivityVersion = '1.6.1'
- androidxAppCompatVersion = '1.4.2'
+ androidxActivityVersion = '1.7.0'
+ androidxAppCompatVersion = '1.6.1'
  androidxCoordinatorLayoutVersion = '1.2.0'
- androidxCoreVersion = '1.8.0'
- androidxFragmentVersion = '1.4.1'
- coreSplashScreenVersion = '1.0.0-rc01'
- androidxWebkitVersion = '1.4.0'
+ androidxCoreVersion = '1.10.0'
+ androidxFragmentVersion = '1.5.6'
+ coreSplashScreenVersion = '1.0.0'
+ androidxWebkitVersion = '1.6.1'
  junitVersion = '4.13.2'
- androidxJunitVersion = '1.1.3'
- androidxEspressoCoreVersion = '3.4.0'
+ androidxJunitVersion = '1.1.5'
+ androidxEspressoCoreVersion = '3.5.1'
  cordovaAndroidVersion = '10.1.1'
 }

capacitor.config.ts

@@ -19,11 +19,13 @@ const config: CapacitorConfig = {
  Keyboard: {
  resize: KeyboardResize.Ionic,
  },
+ "CapacitorHttp": {
+ "enabled": false
+ }
  },
- /* server: {
- url: "http://192.168.1.22:8100",
- cleartext: true
- }, */
+ /*server : {
+ url: "http://localhost:8100/" // Address of the server running locally
+ },*/
 };
 
 export default config;