Merge branch 'soru/release' into 'main'

chore: Version update & olm-CI

See merge request ChristianPauly/fluffychat-flutter!162

.gitlab-ci.yml

@@ -28,11 +28,10 @@ build_web:
     - sudo apt update
     - sudo apt install curl -y
     - rm -r assets/js/package
-    # enable olm AFTER we move website out of USA
+    - cd assets/js/ && curl -L 'https://gitlab.com/famedly/libraries/olm/-/jobs/artifacts/master/download?job=build_js' > olm.zip && cd ../../
-#    - cd assets/js/ && curl -L 'https://gitlab.com/famedly/libraries/olm/-/jobs/artifacts/master/download?job=build_js' > olm.zip && cd ../../
+    - cd assets/js/ && unzip olm.zip && cd ../../
-#    - cd assets/js/ && unzip olm.zip && cd ../../
+    - cd assets/js/ && rm olm.zip && cd ../../
-#    - cd assets/js/ && rm olm.zip && cd ../../
+    - cd assets/js/ && mv javascript package && cd ../../
-#    - cd assets/js/ && mv javascript package && cd ../../
     - cd web/ && rm sql-wasm.js sql-wasm.wasm && cd ../
     - cd web/ && curl -L 'https://github.com/sql-js/sql.js/releases/latest/download/sqljs-wasm.zip' > sqljs-wasm.zip && cd ../
     - cd web/ && unzip sqljs-wasm.zip && cd ../
@@ -41,16 +40,15 @@ build_web:
     - flutter pub get
     - flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/l10n/l10n.dart lib/l10n/intl_*.arb
     - flutter build web --release --verbose
-    # TODO: upload elsewhere
+    # upload elsewhere, if wanted
   artifacts:
     paths:
       - build/web/
 
 
-build_android_debug_no_olm:
+build_android_debug:
   stage: coverage
   script:
-    - sed -i 's/^\s*flutter_olm.*/#&/' pubspec.yaml
     - truncate -s $(head -n -2 android/app/build.gradle | wc -c) android/app/build.gradle
     - flutter build apk --debug -v
   artifacts:
@@ -73,36 +71,12 @@ build_android_apk:
     - flutter pub get
     - flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/l10n/l10n.dart lib/l10n/intl_*.arb
     - flutter build apk --release
-    - mkdir -p build/with-olm
+    - mkdir -p build/android
-    - cp build/app/outputs/apk/release/app-release.apk build/with-olm/
+    - cp build/app/outputs/apk/release/app-release.apk build/android/
   artifacts:
     when: on_success
     paths:
-      - build/with-olm/app-release.apk
+      - build/android/app-release.apk
-  only:
-    - main
-    - tags
-
-
-build_android_apk_no_olm:
-  stage: coverage
-  script:
-    - sed -i 's/^\s*flutter_olm.*/#&/' pubspec.yaml
-    - cd android && echo $FDROID_KEY | base64 --decode --ignore-garbage > key.jks && cd ..
-    - cd android && echo "storePassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
-    - cd android && echo "keyPassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
-    - cd android && echo "keyAlias=key" >> key.properties && cd ..
-    - cd android && echo "storeFile=../key.jks" >> key.properties && cd ..
-    - cd android/app && echo $GOOGLE_SERVICES >> google-services.json && cd ../..
-    - flutter pub get
-    - flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/l10n/l10n.dart lib/l10n/intl_*.arb
-    - flutter build apk --release
-    - mkdir -p build/without-olm
-    - cp build/app/outputs/apk/release/app-release.apk build/without-olm/
-  artifacts:
-    when: on_success
-    paths:
-      - build/without-olm/app-release.apk
   only:
     - main
     - tags
@@ -118,36 +92,16 @@ build_android_appbundle:
     - cd android && echo "storeFile=../key.jks" >> key.properties && cd ..
     - cd android/app && echo $GOOGLE_SERVICES >> google-services.json && cd ../..
     - flutter build appbundle --target-platform android-arm,android-arm64,android-x64
-    - mkdir -p build/with-olm
+    - mkdir -p build/android
-    - cp build/app/outputs/bundle/release/app-release.aab build/with-olm/
+    - cp build/app/outputs/bundle/release/app-release.aab build/android/
   artifacts:
     when: on_success
     paths:
-      - build/with-olm/app-release.aab
+      - build/android/app-release.aab
   only:
     - main
 
 
-build_android_appbundle_no_olm:
-  stage: coverage
-  script:
-    - sed -i 's/^\s*flutter_olm.*/#&/' pubspec.yaml
-    - cd android && echo $FDROID_KEY | base64 --decode --ignore-garbage > key.jks && cd ..
-    - cd android && echo "storePassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
-    - cd android && echo "keyPassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
-    - cd android && echo "keyAlias=key" >> key.properties && cd ..
-    - cd android && echo "storeFile=../key.jks" >> key.properties && cd ..
-    - cd android/app && echo $GOOGLE_SERVICES >> google-services.json && cd ../..
-    - flutter build appbundle --target-platform android-arm,android-arm64,android-x64
-    - mkdir -p build/without-olm
-    - cp build/app/outputs/bundle/release/app-release.aab build/without-olm/
-  artifacts:
-    when: on_success
-    paths:
-      - build/without-olm/app-release.aab
-  only:
-    - main
-
 upload_to_fdroid_repo:
   stage: publish
   before_script:
@@ -173,8 +127,8 @@ upload_to_fdroid_repo:
   script:
     - export UPDATE_VERSION=$(pcregrep -o1 'version:\\s([0-9]*\\.[0-9]*\\.[0-9]*)\\+[0-9]*' pubspec.yaml)
     - mkdir -p upload
-    - cp build/with-olm/* upload/
+    - cp build/android/* upload/
-    - cd build/with-olm/
+    - cd build/android/
     - mv app-release.apk "${UPDATE_VERSION}.apk"
     - rsync -rav -e ssh ./ fluffy@fdroid.nordgedanken.dev:/fdroid/repo
     - ssh fluffy@fdroid.nordgedanken.dev "cd fdroid && fdroid update"

CHANGELOG.md

@@ -1,4 +1,4 @@
-# Version 0.18.0 - 2020-09-??
+# Version 0.18.0 - 2020-09-13
 ### Features
 - Added translations: Armenian, Turkish, Chinese (Simplified), Estonian
 - Url-ify matrix identifiers

pubspec.yaml

@@ -11,7 +11,7 @@ description: Chat with your friends.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.17.0+44
+version: 0.18.0+45
 
 environment:
   sdk: ">=2.6.0 <3.0.0"