Merge branch 'main' of gitlab.com:veilid/veilidchat into dht-work

.gitignore

@@ -54,3 +54,5 @@ app.*.map.json
 
 # WASM
 /web/wasm/
+
+android/key.properties

.gitlab-ci.yml

@@ -20,19 +20,20 @@ build:
     - echo "place holder for build"
     - sudo softwareupdate --install-rosetta --agree-to-license
     - git clone https://gitlab.com/veilid/veilid.git ../veilid
-    - curl –proto ‘=https’ –tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+    #- curl –proto ‘=https’ –tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-    - source "$HOME/.cargo/env"
+    #- source "$HOME/.cargo/env"
-    - brew install capnp cmake wabt llvm protobuf openjdk@17 jq
+    #- brew install capnp cmake wabt llvm protobuf openjdk@17 jq cocoapods
-    - cargo install wasm-bindgen-cli wasm-pack cargo-edit
+    #- cargo install wasm-bindgen-cli wasm-pack cargo-edit
-    - sudo gem install cocoapods
     - wget https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_3.13.5-stable.zip
     - unzip flutter_macos_arm64_3.13.5-stable.zip && export PATH="$PATH:`pwd`/flutter/bin"
-    #- yes | flutter doctor --android-licenses
+    - flutter upgrade
+    - yes | flutter doctor --android-licenses
     - flutter config --enable-macos-desktop --enable-ios
     - flutter config --no-analytics
     - dart --disable-analytics
     - flutter doctor -v
-    - flutter build ipa
+    #- flutter build ipa
+    #- flutter build appbundle
   when: manual
 
 #test:

README.md

@@ -2,7 +2,7 @@
 
 VeilidChat is a chat application written for the Veilid (https://www.veilid.com) distributed application platform. It has a familiar and simple interface and is designed for private, and secure person-to-person communications.
 
-For more information about VeilidChat: https://veilid.chat
+For more information about VeilidChat: https://veilid.com/chat/
 
 For more information about the Veilid network protocol and app development platform: https://veilid.com
 

android/app/build.gradle

@@ -25,6 +25,15 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def buildConfig = 'debug'
+
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+   keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+   buildConfig = 'release'
+}
+
 android {
     ndkVersion "25.1.8937393"
     compileSdkVersion flutter.compileSdkVersion
@@ -53,15 +62,27 @@ android {
         versionName flutterVersionName
     }
 
-    buildTypes {
+    signingConfigs {
-        release {
+       release {
-            // TODO: Add your own signing config for the release build.
+           keyAlias keystoreProperties['keyAlias']
-            // Signing with the debug keys for now, so `flutter run --release` works.
+           keyPassword keystoreProperties['keyPassword']
+           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+           storePassword keystoreProperties['storePassword']
+       }
+   }
+   
+   buildTypes {
+       release {
             shrinkResources false
             minifyEnabled false
-            signingConfig signingConfigs.debug
+            if (buildConfig == 'release') {
-        }
+                signingConfig signingConfigs.release
-    }
+            } else {
+                signingConfig signingConfigs.debug
+            }
+       }
+   }
+    
     namespace 'com.veilid.veilidchat'
 }
 

pubspec.yaml

@@ -1,7 +1,7 @@
 name: veilidchat
 description: VeilidChat
 publish_to: 'none'
-version: 1.0.2+0
+version: 0.1.2+4
 
 environment:
   sdk: '>=3.2.0 <4.0.0'