From ec4b907142470b976e2f2b2ce0287d446f5b584c Mon Sep 17 00:00:00 2001 From: Dara Keon Date: Sat, 21 Sep 2024 02:14:29 +0100 Subject: [PATCH] version: update to 13.0.0.0 --- .github/dependabot.yml | 20 +++++++++---------- .../github-actions-commit-checker.yml | 2 +- android/App/build.gradle | 2 +- android/ErrorLogs/build.gradle | 2 +- android/build.gradle | 2 +- api/API/API.csproj | 4 ++-- api/Tests/API/API.Tests.csproj | 4 ++-- core/Authentication/Authentication.csproj | 4 ++-- core/BusinessLogic/BusinessLogic.csproj | 4 ++-- core/Email/Email.csproj | 4 ++-- core/Entities/Entities.csproj | 4 ++-- core/Exchange/Exchange.csproj | 4 ++-- core/Generic/Generic.csproj | 4 ++-- core/Language/Language.csproj | 4 ++-- core/Language/Language/Version/en-us.json | 9 +++++++++ core/Language/Language/Version/pt-br.json | 9 +++++++++ core/Logs/Logs.csproj | 4 ++-- .../BusinessLogic/BusinessLogic.Tests.csproj | 4 ++-- core/Tests/Email/Email.Tests.csproj | 4 ++-- core/Tests/Entities/Entities.Tests.csproj | 4 ++-- core/Tests/Exchange/Exchange.Tests.csproj | 4 ++-- core/Tests/Generic/Generic.Tests.csproj | 4 ++-- core/Tests/Language/Language.Tests.csproj | 4 ++-- core/Tests/Util/Tests.Util.csproj | 4 ++-- docs/RELEASES.md | 12 ++++++++--- docs/TODO.md | 6 +----- robot/Robot/Robot.csproj | 4 ++-- site/MVC/MVC.csproj | 4 ++-- site/Tests/Browser/package-lock.json | 4 ++-- site/Tests/Browser/package.json | 2 +- site/Tests/MVC/MVC.Tests.csproj | 4 ++-- version/Cargo.lock | 2 +- version/Cargo.toml | 2 +- 33 files changed, 87 insertions(+), 67 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e7f4feb90..decbe7528 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,7 +7,7 @@ version: 2 updates: - package-ecosystem: "nuget" directory: "/core/" - target-branch: "13.0.0.0" + target-branch: "13.1.0.0" schedule: interval: "weekly" rebase-strategy: "disabled" @@ -19,7 +19,7 @@ updates: - package-ecosystem: "nuget" directory: "/site/" - target-branch: "13.0.0.0" + target-branch: "13.1.0.0" schedule: interval: "weekly" rebase-strategy: "disabled" @@ -31,7 +31,7 @@ updates: - package-ecosystem: "nuget" directory: "/api/" - target-branch: "13.0.0.0" + target-branch: "13.1.0.0" schedule: interval: "weekly" rebase-strategy: "disabled" @@ -43,7 +43,7 @@ updates: - package-ecosystem: "nuget" directory: "/robot/" - target-branch: "13.0.0.0" + target-branch: "13.1.0.0" schedule: interval: "weekly" rebase-strategy: "disabled" @@ -55,7 +55,7 @@ updates: - package-ecosystem: "npm" directory: "/site/Tests/Browser/" - target-branch: "13.0.0.0" + target-branch: "13.1.0.0" schedule: interval: "weekly" rebase-strategy: "disabled" @@ -67,7 +67,7 @@ updates: - package-ecosystem: "gradle" directory: "/android/" - target-branch: "13.0.0.0" + target-branch: "13.1.0.0" schedule: interval: "weekly" rebase-strategy: "disabled" @@ -79,7 +79,7 @@ updates: - package-ecosystem: "docker" directory: "/architecture/ci/" - target-branch: "13.0.0.0" + target-branch: "13.1.0.0" schedule: interval: "weekly" rebase-strategy: "disabled" @@ -91,7 +91,7 @@ updates: - package-ecosystem: "docker" directory: "/architecture/publish/" - target-branch: "13.0.0.0" + target-branch: "13.1.0.0" schedule: interval: "weekly" rebase-strategy: "disabled" @@ -103,7 +103,7 @@ updates: - package-ecosystem: "cargo" directory: "/version/" - target-branch: "13.0.0.0" + target-branch: "13.1.0.0" schedule: interval: "weekly" rebase-strategy: "disabled" @@ -115,7 +115,7 @@ updates: - package-ecosystem: "pip" directory: "/midna/" - target-branch: "13.0.0.0" + target-branch: "13.1.0.0" schedule: interval: "weekly" rebase-strategy: "disabled" diff --git a/.github/workflows/github-actions-commit-checker.yml b/.github/workflows/github-actions-commit-checker.yml index 3c3a1eccb..4c327e236 100644 --- a/.github/workflows/github-actions-commit-checker.yml +++ b/.github/workflows/github-actions-commit-checker.yml @@ -4,7 +4,7 @@ on: types: [opened, reopened, synchronize] branches: [ "main" ] push: - branches: [ "13.0.0.0" ] + branches: [ "13.1.0.0" ] jobs: check-commit-message: diff --git a/android/App/build.gradle b/android/App/build.gradle index 45ff44aca..fe6c7bdf9 100644 --- a/android/App/build.gradle +++ b/android/App/build.gradle @@ -14,7 +14,7 @@ android { // read the explanation // at the end of the file //noinspection HighAppVersionCode - versionCode 2011000068 + versionCode 2011000069 versionName "$dfm_version" minSdkVersion 21 diff --git a/android/ErrorLogs/build.gradle b/android/ErrorLogs/build.gradle index 4c79cf29b..70078ca3d 100644 --- a/android/ErrorLogs/build.gradle +++ b/android/ErrorLogs/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { applicationId "com.darakeon.dfm.error_logs" - versionCode 22 + versionCode 23 versionName "$dfm_version" minSdkVersion 21 diff --git a/android/build.gradle b/android/build.gradle index 91212a5f0..be392c1b9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,7 +20,7 @@ buildscript { ext.testrunner_version = '1.0.2' ext.expresso_version = '3.0.2' - ext.dfm_version = "12.1.0.0" + ext.dfm_version = "13.0.0.0" repositories { google() diff --git a/api/API/API.csproj b/api/API/API.csproj index 8d7b13de4..033e5a64d 100644 --- a/api/API/API.csproj +++ b/api/API/API.csproj @@ -6,8 +6,8 @@ DFM.$(MSBuildProjectName.Replace(" ", "_")) false false - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 Assets/favicon.ico diff --git a/api/Tests/API/API.Tests.csproj b/api/Tests/API/API.Tests.csproj index d5128c702..690c79cbf 100644 --- a/api/Tests/API/API.Tests.csproj +++ b/api/Tests/API/API.Tests.csproj @@ -5,8 +5,8 @@ false DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Authentication/Authentication.csproj b/core/Authentication/Authentication.csproj index 666962e7f..278809143 100644 --- a/core/Authentication/Authentication.csproj +++ b/core/Authentication/Authentication.csproj @@ -4,8 +4,8 @@ net8.0 DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/BusinessLogic/BusinessLogic.csproj b/core/BusinessLogic/BusinessLogic.csproj index 5ce7dfb33..ed88cb0c1 100644 --- a/core/BusinessLogic/BusinessLogic.csproj +++ b/core/BusinessLogic/BusinessLogic.csproj @@ -4,8 +4,8 @@ net8.0 DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Email/Email.csproj b/core/Email/Email.csproj index 3ab34fbe3..031831766 100644 --- a/core/Email/Email.csproj +++ b/core/Email/Email.csproj @@ -4,8 +4,8 @@ net8.0 DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Entities/Entities.csproj b/core/Entities/Entities.csproj index 9b8bee7aa..0bab870ef 100644 --- a/core/Entities/Entities.csproj +++ b/core/Entities/Entities.csproj @@ -4,8 +4,8 @@ net8.0 DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Exchange/Exchange.csproj b/core/Exchange/Exchange.csproj index fcc4b1bd8..69062bc4a 100644 --- a/core/Exchange/Exchange.csproj +++ b/core/Exchange/Exchange.csproj @@ -4,8 +4,8 @@ net8.0 DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Generic/Generic.csproj b/core/Generic/Generic.csproj index 1b528d14f..bd56442ce 100644 --- a/core/Generic/Generic.csproj +++ b/core/Generic/Generic.csproj @@ -4,8 +4,8 @@ net8.0 DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 enable diff --git a/core/Language/Language.csproj b/core/Language/Language.csproj index 7b6fede9d..396d2d923 100644 --- a/core/Language/Language.csproj +++ b/core/Language/Language.csproj @@ -4,8 +4,8 @@ net8.0 DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Language/Language/Version/en-us.json b/core/Language/Language/Version/en-us.json index 3ea3a56cd..662d75d0c 100644 --- a/core/Language/Language/Version/en-us.json +++ b/core/Language/Language/Version/en-us.json @@ -1,4 +1,13 @@ { + "13.0.0.0": [ + "Data Export", + "Improvements at menus", + "Data Import", + "Fix email images", + "Fix sponsor link", + "Fix print Terms", + "Notice about scheduling times" + ], "12.1.0.0": [ "Put contract in a external address" ], diff --git a/core/Language/Language/Version/pt-br.json b/core/Language/Language/Version/pt-br.json index 0f52e34aa..cfbc9a3c1 100644 --- a/core/Language/Language/Version/pt-br.json +++ b/core/Language/Language/Version/pt-br.json @@ -1,4 +1,13 @@ { + "13.0.0.0": [ + "Exportação de Movimentações", + "Ajustes nos menus", + "Importação de Movimentações", + "Arrumadas imagens dos e-mails", + "Arrumado botão de patrocínio", + "Arrumada impressão de Termos", + "Aviso sobre tempo de Agendamentos" + ], "12.1.0.0": [ "Colocado contrato em endereço externo" ], diff --git a/core/Logs/Logs.csproj b/core/Logs/Logs.csproj index ca5c2a937..a381d91ae 100644 --- a/core/Logs/Logs.csproj +++ b/core/Logs/Logs.csproj @@ -4,8 +4,8 @@ net8.0 DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Tests/BusinessLogic/BusinessLogic.Tests.csproj b/core/Tests/BusinessLogic/BusinessLogic.Tests.csproj index 00460f2d1..87df148c2 100644 --- a/core/Tests/BusinessLogic/BusinessLogic.Tests.csproj +++ b/core/Tests/BusinessLogic/BusinessLogic.Tests.csproj @@ -5,8 +5,8 @@ false DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Tests/Email/Email.Tests.csproj b/core/Tests/Email/Email.Tests.csproj index f051da594..58a56c238 100644 --- a/core/Tests/Email/Email.Tests.csproj +++ b/core/Tests/Email/Email.Tests.csproj @@ -5,8 +5,8 @@ false DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Tests/Entities/Entities.Tests.csproj b/core/Tests/Entities/Entities.Tests.csproj index 0883d2d0f..6311db0f8 100644 --- a/core/Tests/Entities/Entities.Tests.csproj +++ b/core/Tests/Entities/Entities.Tests.csproj @@ -5,8 +5,8 @@ false DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 enable diff --git a/core/Tests/Exchange/Exchange.Tests.csproj b/core/Tests/Exchange/Exchange.Tests.csproj index b2076b4f5..532c573a7 100644 --- a/core/Tests/Exchange/Exchange.Tests.csproj +++ b/core/Tests/Exchange/Exchange.Tests.csproj @@ -5,8 +5,8 @@ false DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Tests/Generic/Generic.Tests.csproj b/core/Tests/Generic/Generic.Tests.csproj index d99583ed0..29503bad3 100644 --- a/core/Tests/Generic/Generic.Tests.csproj +++ b/core/Tests/Generic/Generic.Tests.csproj @@ -5,8 +5,8 @@ false DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Tests/Language/Language.Tests.csproj b/core/Tests/Language/Language.Tests.csproj index 59e476fa1..f4b0644d8 100644 --- a/core/Tests/Language/Language.Tests.csproj +++ b/core/Tests/Language/Language.Tests.csproj @@ -5,8 +5,8 @@ false DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/core/Tests/Util/Tests.Util.csproj b/core/Tests/Util/Tests.Util.csproj index edc5e7b15..4932a29bc 100644 --- a/core/Tests/Util/Tests.Util.csproj +++ b/core/Tests/Util/Tests.Util.csproj @@ -4,8 +4,8 @@ net8.0 DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/docs/RELEASES.md b/docs/RELEASES.md index 546ffe83c..b01b54506 100644 --- a/docs/RELEASES.md +++ b/docs/RELEASES.md @@ -4,9 +4,9 @@ This is the list of project releases, past and current. To see tasks that are still on hold, go to [TODO](TODO.md). -- [go to published version](#12.1.0.0) -- [go to version in development](#13.0.0.0) -- [dev version state](../../13.0.0.0/docs/RELEASES.md#13.0.0.0) +- [go to published version](#13.0.0.0) +- [go to version in development](#13.1.0.0) +- [dev version state](../../13.1.0.0/docs/RELEASES.md#13.1.0.0) ## Legend - 🐉: at least one huge change (increases first number) @@ -14,6 +14,12 @@ This is the list of project releases, past and current. To see tasks that are st - 🐑: at least one little change, as a change at an existing feature (increases third number) - 🐜: the developer is improving stuff or fixing some sh\*t it did (increases last number) +## 13.1.0.0 :🐳: `4` +- [ ] Put terms of use in static site on S3 +- [ ] Add create README contract in CI +- [ ] Get contract text from DB to create README in terms +- [ ] Deploy APKs using CI + ## 13.0.0.0 🐉 `7` - [x] `240825>240921` Data export (csv) [template] - [x] `240807>240807` Adjust menus to avoid responsiviness problem diff --git a/docs/TODO.md b/docs/TODO.md index c53704c74..267090bf9 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -13,12 +13,8 @@ This is the task list for the project. The tasks are ordered by: Points then Importance then [Type](RELEASES.md#legend). -| Task (50) | Typ | Dif | Imp | Pts | +| Task (46) | Typ | Dif | Imp | Pts | | ------------------------------------------------------------------------------ | --- | --- | --- | --- | -| Deploy APKs using CI | 🐑 | 2 | 4 | 6 | -| Get contract text from DB to create README in terms | 🐑 | 1 | 4 | 7 | -| Add create README contract in CI | 🐑 | 1 | 4 | 7 | -| Put terms of use in static site on S3 | 🐳 | 2 | 4 | 6 | | Implement entities limits (acc opened, cat enabled, moves/month, active sched) | 🐉 | 2 | 4 | 6 | | Add semgrep to dfm, dk-lib, meak and server | 🐳 | 2 | 4 | 6 | | [clear headers on nginx](todo/clear-headers.png) | 🐳 | 2 | 4 | 6 | diff --git a/robot/Robot/Robot.csproj b/robot/Robot/Robot.csproj index d14887d8a..6bb57cdee 100644 --- a/robot/Robot/Robot.csproj +++ b/robot/Robot/Robot.csproj @@ -5,8 +5,8 @@ net8.0 DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/site/MVC/MVC.csproj b/site/MVC/MVC.csproj index 7902ec906..7a2230635 100644 --- a/site/MVC/MVC.csproj +++ b/site/MVC/MVC.csproj @@ -6,8 +6,8 @@ DFM.$(MSBuildProjectName.Replace(" ", "_")) false false - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 Assets\images\pig-on.ico diff --git a/site/Tests/Browser/package-lock.json b/site/Tests/Browser/package-lock.json index 4bb24cc33..4a1efa8e5 100644 --- a/site/Tests/Browser/package-lock.json +++ b/site/Tests/Browser/package-lock.json @@ -1,12 +1,12 @@ { "name": "browser-tests", - "version": "1201.0.0", + "version": "1300.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "browser-tests", - "version": "1201.0.0", + "version": "1300.0.0", "license": "GPL-3.0", "dependencies": { "bcrypt": "^5.1.1", diff --git a/site/Tests/Browser/package.json b/site/Tests/Browser/package.json index 83dc37ee4..3140bff04 100644 --- a/site/Tests/Browser/package.json +++ b/site/Tests/Browser/package.json @@ -1,6 +1,6 @@ { "name": "browser-tests", - "version": "1201.0.0", + "version": "1300.0.0", "description": "DfM Site Tests", "main": "index.js", "dependencies": { diff --git a/site/Tests/MVC/MVC.Tests.csproj b/site/Tests/MVC/MVC.Tests.csproj index 27c962367..c323cd667 100644 --- a/site/Tests/MVC/MVC.Tests.csproj +++ b/site/Tests/MVC/MVC.Tests.csproj @@ -5,8 +5,8 @@ false DFM.$(MSBuildProjectName) DFM.$(MSBuildProjectName.Replace(" ", "_")) - 12.1.0.0 - 12.1.0.0 + 13.0.0.0 + 13.0.0.0 diff --git a/version/Cargo.lock b/version/Cargo.lock index 6e347677a..f76e384ea 100644 --- a/version/Cargo.lock +++ b/version/Cargo.lock @@ -117,7 +117,7 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "dfm-version" -version = "1201.0.0" +version = "1300.0.0" dependencies = [ "dirs", "git2", diff --git a/version/Cargo.toml b/version/Cargo.toml index 9e94bb8c6..5bc2d702d 100644 --- a/version/Cargo.toml +++ b/version/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dfm-version" -version = "1201.0.0" +version = "1300.0.0" authors = ["Dara Keon "] edition = "2021"