Compare commits
197
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
41910cc4cd | ||
|
|
db166ca9d4 | ||
|
|
db0d5a4a85 | ||
|
|
3bc0d7cf95 | ||
|
|
8f464d95fd | ||
|
|
5ccd6a3368 | ||
|
|
cdbded246e | ||
|
|
750c7758bd | ||
|
|
22f8b14ecd | ||
|
|
6e27d6d4e6 | ||
|
|
14ff4dbd05 | ||
|
|
390c2d0cf3 | ||
|
|
e58914ef58 | ||
|
|
a03f08fca1 | ||
|
|
8e9b87f00c | ||
|
|
f765224a86 | ||
|
|
14d2219eb8 | ||
|
|
137580ccf9 | ||
|
|
f101d22f54 | ||
|
|
68aedb7641 | ||
|
|
754d526b49 | ||
|
|
c458871569 | ||
|
|
056825aa0c | ||
|
|
16b19fc5ce | ||
|
|
4ad4a23ed8 | ||
|
|
d8c215eacc | ||
|
|
2b446ab22b | ||
|
|
a029d8a7dc | ||
|
|
4482234e1a | ||
|
|
b5de30f561 | ||
|
|
70ad5f322c | ||
|
|
d167092c83 | ||
|
|
c4f4bafe85 | ||
|
|
ed06b22a77 | ||
|
|
172362b533 | ||
|
|
ad72cb6f56 | ||
|
|
9057ee0052 | ||
|
|
50d0b44315 | ||
|
|
21b08ed384 | ||
|
|
993c4d2ee9 | ||
|
|
57a9d51027 | ||
|
|
673f0edb8b | ||
|
|
7f96798f13 | ||
|
|
6e5704a45b | ||
|
|
495591159f | ||
|
|
718fe7c5ee | ||
|
|
ecd23213f9 | ||
|
|
e6baed8cb4 | ||
|
|
c87abec0b9 | ||
|
|
0aba41d8bf | ||
|
|
2a2d1047b4 | ||
|
|
66ef1ccf32 | ||
|
|
677ede5bc7 | ||
|
|
996a7ed22c | ||
|
|
85208c4e5a | ||
|
|
5cfec50cba | ||
|
|
76ad71e1dc | ||
|
|
0277fb507c | ||
|
|
8d7d3174aa | ||
|
|
00eb3333fe | ||
|
|
629ca01d99 | ||
|
|
c2d8681ce8 | ||
|
|
08f79cb148 | ||
|
|
e21906e70d | ||
|
|
9d2cc32bc9 | ||
|
|
d9d057c8dc | ||
|
|
1f3fa0c4a6 | ||
|
|
dea3def385 | ||
|
|
f72ef2f5d4 | ||
|
|
f28cb759df | ||
|
|
b9d69c3e64 | ||
|
|
c2a1c9eaac | ||
|
|
bf37209a15 | ||
|
|
2c558fe6fd | ||
|
|
ad88011454 | ||
|
|
559c17bc1d | ||
|
|
ab9c46f0eb | ||
|
|
aa799d2ca8 | ||
|
|
177c978474 | ||
|
|
39b9991413 | ||
|
|
b303f110f1 | ||
|
|
f851941a6a | ||
|
|
a313552976 | ||
|
|
6ac97ed3fe | ||
|
|
d583b937b7 | ||
|
|
15b9a2d935 | ||
|
|
5a8ce15961 | ||
|
|
e1c64cef46 | ||
|
|
ee064f3cb4 | ||
|
|
3e46e2ff29 | ||
|
|
f28e702549 | ||
|
|
fc31a4399c | ||
|
|
9b23053b66 | ||
|
|
389a04d250 | ||
|
|
40e1d1478b | ||
|
|
2154ff3c33 | ||
|
|
2245565f95 | ||
|
|
014858f06b | ||
|
|
3f1f86a78e | ||
|
|
a549169a7c | ||
|
|
be7cae365a | ||
|
|
cef3b2e593 | ||
|
|
ae927ebc57 | ||
|
|
90532cf501 | ||
|
|
ab0678d61e | ||
|
|
a1b7d22d26 | ||
|
|
29eae4b1f6 | ||
|
|
f5bbc63481 | ||
|
|
ddc72d85b0 | ||
|
|
68bbf5b2d3 | ||
|
|
95e76a55da | ||
|
|
2b6659f4ec | ||
|
|
e0c118a73e | ||
|
|
4e61b2aed6 | ||
|
|
ba2758c0a3 | ||
|
|
c718b966a1 | ||
|
|
99438e142f | ||
|
|
4d8076c3cf | ||
|
|
db75c5b74a | ||
|
|
966a082147 | ||
|
|
cd20a5ec29 | ||
|
|
cc4c1c9201 | ||
|
|
ff021d572c | ||
|
|
89992967be | ||
|
|
3c68bde62b | ||
|
|
c38251f5b3 | ||
|
|
a01f6d2322 | ||
|
|
417a33eb25 | ||
|
|
2e7f7f23b3 | ||
|
|
e5e182761e | ||
|
|
a094d88799 | ||
|
|
e51915d1cd | ||
|
|
3a654f6ede | ||
|
|
5227751dca | ||
|
|
27eafe4ff4 | ||
|
|
8c83a9408b | ||
|
|
fe2410f719 | ||
|
|
a5e86bfb77 | ||
|
|
23be633798 | ||
|
|
813e0707d8 | ||
|
|
9ed9bf07fc | ||
|
|
47265c10d0 | ||
|
|
5cc633246a | ||
|
|
1f40385786 | ||
|
|
eb2876324a | ||
|
|
633b817d76 | ||
|
|
2cfaa9b285 | ||
|
|
f42ae97326 | ||
|
|
3b0028164b | ||
|
|
7420adeb5c | ||
|
|
316027ca3b | ||
|
|
9d58fba5c9 | ||
|
|
284c19ef89 | ||
|
|
7cfd17231a | ||
|
|
527830a5ae | ||
|
|
c4ed30f594 | ||
|
|
156c1681cf | ||
|
|
3593fbca78 | ||
|
|
430fc8e8cb | ||
|
|
4fce19bad4 | ||
|
|
49f5848e7b | ||
|
|
90452100a4 | ||
|
|
bf1196dd0f | ||
|
|
4316dc6516 | ||
|
|
9833a66a64 | ||
|
|
797bf06a9c | ||
|
|
d98b00533d | ||
|
|
bf8f7d8667 | ||
|
|
89c570f34f | ||
|
|
d6a562863a | ||
|
|
a02f06fe2e | ||
|
|
7b088d7bb4 | ||
|
|
477883ed39 | ||
|
|
748ed41096 | ||
|
|
86c50d4881 | ||
|
|
c4c92e6dd9 | ||
|
|
7f0ba193ec | ||
|
|
87ed5b0fa8 | ||
|
|
6947743ac0 | ||
|
|
07e3710d44 | ||
|
|
e68da7764f | ||
|
|
c3ff894027 | ||
|
|
f09f731d30 | ||
|
|
956c4341c7 | ||
|
|
7b68264dd7 | ||
|
|
cfcf030bf8 | ||
|
|
0e7d7a5835 | ||
|
|
0856ebb889 | ||
|
|
25bf68cf0c | ||
|
|
afc6f392c6 | ||
|
|
a0b5e2052b | ||
|
|
87d1ef2bce | ||
|
|
537a6d3a0b | ||
|
|
dbe97f564e | ||
|
|
3a3bf03114 | ||
|
|
c09a32e9ad | ||
|
|
b02a588dff |
+76
-30
@@ -3,27 +3,38 @@ type: docker
|
||||
name: test
|
||||
|
||||
steps:
|
||||
- name: AnylyseBuildTest
|
||||
- name: Lint
|
||||
failure: ignore
|
||||
image: mingc/android-build-box:latest
|
||||
commands:
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Install linters..."
|
||||
- curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
|
||||
- curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.1/detekt-cli-1.23.1.zip && unzip detekt-cli-1.23.1.zip
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Linting..."
|
||||
- ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build' || true
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Detecting..."
|
||||
- ./detekt-cli-1.23.1/bin/detekt-cli --all-rules --excludes '**/shared/build/**/*.kt' || true
|
||||
- echo "---------------------------------------------------------"
|
||||
command_timeout: 1m
|
||||
- name: BuildAndTest
|
||||
image: mingc/android-build-box:latest
|
||||
commands:
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Configure gradle..."
|
||||
- mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\nappLoginUrl=\"URL\"\nappLoginUsername=\"LOGIN\"\nappLoginPassword=\"PASS\"\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
|
||||
- mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Analysing..."
|
||||
- ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN
|
||||
- echo "Configure java..."
|
||||
- . ~/.bash_profile
|
||||
- jenv global 17.0
|
||||
- java --version
|
||||
- date
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Building..."
|
||||
- echo "Building and testing..."
|
||||
- ./gradlew build
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Testing..."
|
||||
- echo "---------------------------------------------------------"
|
||||
- ./gradlew test
|
||||
environment:
|
||||
SONAR_HOST_URL:
|
||||
from_secret: sonarScannerHostUrl
|
||||
SONAR_LOGIN:
|
||||
from_secret: sonarScannerLogin
|
||||
trigger:
|
||||
event:
|
||||
- push
|
||||
@@ -35,23 +46,36 @@ type: docker
|
||||
name: Publish
|
||||
|
||||
steps:
|
||||
- name: createTag
|
||||
- name: createTagAndChangelog
|
||||
image: ubuntu:latest
|
||||
commands:
|
||||
- apt-get update && apt-get install -y git
|
||||
- git fetch --tags -p
|
||||
- PREV=$(git describe --tags --abbrev=0)
|
||||
- ./build.sh --publish --from-ci
|
||||
- git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
|
||||
- git push pushing --tags
|
||||
- VER=$(git describe --tags --abbrev=0)
|
||||
- CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
|
||||
- echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
|
||||
- git add CHANGELOG.md
|
||||
- git commit -m "Changelog for $VER [CI SKIP]"
|
||||
environment:
|
||||
GITEA_USR:
|
||||
from_secret: giteaUsr
|
||||
GITEA_PASS:
|
||||
from_secret: giteaPass
|
||||
TZ: Europe/Paris
|
||||
|
||||
- name: git-push
|
||||
image: appleboy/drone-git-push
|
||||
settings:
|
||||
branch: master
|
||||
remote:
|
||||
from_secret: remoteUrl
|
||||
followtags: true
|
||||
ssh_key:
|
||||
from_secret: privateKey
|
||||
skip_verify: true
|
||||
|
||||
- name: scpFiles
|
||||
image: appleboy/drone-scp
|
||||
settings:
|
||||
host: amine-louveau.fr
|
||||
host: amine-bouabdallaoui.fr
|
||||
username: ubuntu
|
||||
key:
|
||||
from_secret: privateKey
|
||||
@@ -62,16 +86,13 @@ steps:
|
||||
- name: deploy
|
||||
image: appleboy/drone-ssh
|
||||
settings:
|
||||
host: amine-louveau.fr
|
||||
host: amine-bouabdallaoui.fr
|
||||
user: ubuntu
|
||||
key:
|
||||
from_secret: privateKey
|
||||
command_timeout: 2m
|
||||
script:
|
||||
- cd /home/ubuntu
|
||||
- sudo rm -rf /var/www/amine/version.txt
|
||||
- sudo chown www-data:www-data ./version.txt
|
||||
- sudo mv version.txt /var/www/amine/
|
||||
- cd /home/ubuntu && sudo rm -rf /var/www/amine/version.txt && sudo chown www-data:www-data ./version.txt && sudo mv version.txt /var/www/amine/
|
||||
|
||||
trigger:
|
||||
event:
|
||||
@@ -88,15 +109,18 @@ steps:
|
||||
- name: build
|
||||
image: mingc/android-build-box:latest
|
||||
commands:
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Fetch tags..."
|
||||
- git fetch --tags
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Configure gradle..."
|
||||
- mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\nappLoginUrl=\"URL\"\nappLoginUsername=\"LOGIN\"\nappLoginPassword=\"PASS\"\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
|
||||
- mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Generate APK"
|
||||
- ./gradlew :androidApp:assembleGithubConfigRelease -P pushCache=false
|
||||
- ./gradlew :androidApp:assembleGithubConfigRelease
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Get Key"
|
||||
- wget https://amine-louveau.fr/key
|
||||
- wget https://amine-bouabdallaoui.fr/key
|
||||
- echo "---------------------------------------------------------"
|
||||
- echo "Zipalign"
|
||||
- $ANDROID_HOME/build-tools/31.0.0/zipalign -f -v 4 androidApp/build/outputs/apk/githubConfig/release/androidApp-githubConfig-release-unsigned.apk androidApp/build/outputs/apk/githubConfig/release/android-prod-released-ziped.apk
|
||||
@@ -107,6 +131,7 @@ steps:
|
||||
- echo "Verify"
|
||||
- $ANDROID_HOME/build-tools/31.0.0/apksigner verify signed.apk
|
||||
environment:
|
||||
TZ: Europe/Paris
|
||||
YOUR_KEYSTORE_PASSWORD:
|
||||
from_secret: keyPass
|
||||
YOUR_KEY_ALIAS:
|
||||
@@ -117,8 +142,29 @@ steps:
|
||||
settings:
|
||||
api_key:
|
||||
from_secret: giteaAPI
|
||||
base_url: https://gitea.amine-louveau.fr
|
||||
base_url: https://gitea.amine-bouabdallaoui.fr
|
||||
files: signed.apk
|
||||
|
||||
- name: notify
|
||||
image: drillster/drone-email
|
||||
failure: ignore
|
||||
settings:
|
||||
host:
|
||||
from_secret: smtpHOST
|
||||
port:
|
||||
from_secret: smtpPORT
|
||||
username:
|
||||
from_secret: smtpUSERNAME
|
||||
password:
|
||||
from_secret: smtpPASSWORD
|
||||
from:
|
||||
from_secret: smtpFROM
|
||||
subject: Mapping file
|
||||
recipients:
|
||||
from_secret: smtpTO
|
||||
recipients_only: true
|
||||
skip_verify: true
|
||||
attachment: androidApp/build/outputs/mapping/githubConfigRelease/mapping.txt
|
||||
trigger:
|
||||
event:
|
||||
- tag
|
||||
+1
-26
@@ -10,7 +10,7 @@ Please read the guidelines before contributing, and follow them (or try to) when
|
||||
|
||||
There are many ways to contribute to this project, you could [translate the app](https://crowdin.com/project/readerforselfoss), report bugs, request missing features, suggest enhancements and changes to existing ones. You also can improve the README with useful tips that could help the other users.
|
||||
|
||||
You can fork the repository, and [help me solve some issues](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
|
||||
You can fork the repository, and [help me solve some issues](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://gitea.amine-bouabdallaoui.fr/Louvorg/ReaderForSelfoss-multiplatform/issues)
|
||||
|
||||
### What I can't help you with.
|
||||
|
||||
@@ -46,28 +46,3 @@ Always check if the web version of your instance is working.
|
||||
I won't provide any selfoss instance url. If you want to help, but to not have one, you'll have to install one, and use it.
|
||||
|
||||
All the details to need are [here](https://selfoss.aditu.de/).
|
||||
|
||||
# Build the project
|
||||
|
||||
You can directly import this project into IntellIJ/Android Studio.
|
||||
|
||||
You'll have to:
|
||||
|
||||
- Define some parameters either in `~/.gradle/gradle.properties` or as gradle parameters (see the examples)
|
||||
|
||||
- appLoginUrl, appLoginUsername and appLoginPassword: url, username and password of a selfoss instance. **These are only used for tests. They can be empty if you don't test API calls.**
|
||||
|
||||
### Examples:
|
||||
#### Inside ~/.gradle/gradle.properties
|
||||
|
||||
```
|
||||
appLoginUrl="URL" # It can be empty.
|
||||
appLoginUsername="LOGIN" # It can be empty.
|
||||
appLoginPassword="PASS" # It can be empty.
|
||||
```
|
||||
|
||||
#### As gradle parameters
|
||||
|
||||
```
|
||||
./gradlew .... -P appLoginUrl="URL" -P appLoginUsername="LOGIN" -P appLoginPassword="PASS"
|
||||
```
|
||||
|
500 Internal Server Error
Gitea Version: 1.28.0+dev-215-g805697089e | ||||