Merge pull request #765 from threefoldtech/development

Update the main branch with the latest release
threefoldtech · Nov 21, 2024 · 3cb876e · 3cb876e
2 parents 6ae5066 + 36bb7e1
commit 3cb876e
Show file tree

Hide file tree

Showing 279 changed files with 17,957 additions and 3,623 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,66 @@
+name: Bug Report
+
+description: Create a bug report 
+
+title: "Brief Description of the Issue"
+
+labels:
+  - bug
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        #### Please fill the fields to help us solving your bug! Don't forget to add the right label.
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+      - label: I have searched the existing issues
+        required: true
+
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Describe your bug!
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        2. With this config...
+        3. Run '...'
+        4. See error...
+    validations:
+      required: false
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Relevant screenshots/screen records
+      description: |
+       Please provide any relevant screenshots/screen records, this is very important for UI issues.
+       Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. 
+      render: console
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        ### Thanks for taking the time to fill out this bug report!
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,28 @@
+name: Feature request
+description: Suggest an idea for this project
+labels: ["type_feature"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Don't forget to add the right label
+
+  - type: textarea
+    id: describe
+    attributes:
+      label: Is your feature request related to a problem? Please describe
+      placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when \[...]
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      placeholder: A clear and concise description of what you want to happen. If you've a specific approach to discuss, describe it here clearly.
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        ### Thanks for taking the time to fill out this bug report!
diff --git a/.github/PULL_REQUEST.md b/.github/PULL_REQUEST.md
@@ -0,0 +1,11 @@
+### Changes
+
+List of changes this PR includes
+
+### Related Issues
+
+List of related issues
+
+### Tested Scenarios
+
+A list of scenarios tried to match the deliverables
diff --git a/.github/workflows/format_analyze.yml b/.github/workflows/format_analyze.yml
@@ -0,0 +1,27 @@
+name: Format and Analyze
+
+on:
+  pull_request:
+    branches:
+      - development
+  push:
+    branches:
+      - development
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Repository
+        uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          flutter-version: '3.19.0'
+
+      - run: cd app && dart pub get
+
+      - run: dart format app/lib
+
+      - run: dart analyze app/lib
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
diff --git a/.gitignore b/.gitignore
@@ -347,4 +347,10 @@ backend/services/__pycache__/productkeys.cpython-39.pyc
 backend/services/__pycache__/socket.cpython-39.pyc
 
 *.pyc
-.vscode
+.vscode
+
+# reflected files
+app/lib/main.reflectable.dart
+
+# pubSpec override
+app/pubspec_overrides.yaml
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ Wallet v3: <https://github.com/threefoldtech/wallet-next>
 
 Farmer: <https://github.com/threefoldtech/wallet-next>
 
-Support: <https://github.com/threefoldtech/tfsupport>
+Support: <https://github.com/threefoldtech/test_feedback>
 
 ## Frontend
 

diff --git a/app/analysis_options.yaml b/app/analysis_options.yaml
@@ -1,3 +1,13 @@
+analyzer:
+  errors:
+    constant_identifier_names: ignore
+    deprecated_member_use: ignore
+    library_prefixes: ignore
+    library_private_types_in_public_api: ignore
+    non_constant_identifier_names: ignore
+    prefer_interpolation_to_compose_strings: ignore
+    prefer_typing_uninitialized_variables: ignore
+    use_build_context_synchronously: ignore
 include: package:flutter_lints/flutter.yaml
 
 linter:

diff --git a/app/android/app/build_local b/app/android/app/build_local
@@ -34,21 +34,24 @@ android {
     }
 
 		lintOptions {
-        disable 'InvalidPackage'
-    }
+            disable 'InvalidPackage'
+            disable "Instantiatable"
+            checkReleaseBuilds false
+            abortOnError false
+        }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     defaultConfig {
-        applicationId "org.jimber.threebotlogin.local"
-        minSdkVersion 23
+        applicationId "org.jimber.threebotlogin"
+        minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -66,7 +69,6 @@ android {
 
         }
     }
-
     buildTypes {
         release {
             signingConfig signingConfigs.release
@@ -75,6 +77,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildscript {
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 flutter {
@@ -89,6 +100,7 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }
diff --git a/app/android/app/build_production b/app/android/app/build_production
@@ -34,21 +34,24 @@ android {
     }
 
 		lintOptions {
-        disable 'InvalidPackage'
-    }
+            disable 'InvalidPackage'
+            disable "Instantiatable"
+            checkReleaseBuilds false
+            abortOnError false
+        }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     defaultConfig {
         applicationId "org.jimber.threebotlogin"
-        minSdkVersion 23
+        minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -74,6 +77,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildscript {
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 flutter {
@@ -88,6 +100,7 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }
diff --git a/app/android/app/build_staging b/app/android/app/build_staging
@@ -34,21 +34,24 @@ android {
     }
 
 		lintOptions {
-        disable 'InvalidPackage'
-    }
+            disable 'InvalidPackage'
+            disable "Instantiatable"
+            checkReleaseBuilds false
+            abortOnError false
+        }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     defaultConfig {
-        applicationId "org.jimber.threebotlogin.staging"
-        minSdkVersion 23
+        applicationId "org.jimber.threebotlogin"
+        minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -74,6 +77,15 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildscript {
+        ext {
+            stripeVersion = "20.19.1" // This is the version BEFORE the kotlin bump
+        }
+    }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 flutter {
@@ -88,6 +100,7 @@ dependencies {
     implementation 'com.hbb20:ccp:2.4.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-		implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-		implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+	implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }