stakwork · ariel10aguero · Oct 19, 2023 · Oct 6, 2023 · Oct 6, 2023 · Oct 6, 2023
diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
@@ -20,10 +20,10 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Set up JDK 11.0.8
+      - name: Set up JDK 17.0.8
         uses: actions/setup-java@v1
         with:
-          java-version: 11.0.8
+          java-version: 17.0.8
 
       - name: Run Android Linter
         run: ./gradlew :sphinx:application:sphinx:lintDebug --warning-mode=all

diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,9 @@ buildscript {
         classpath plugin.androidGradle
         classpath plugin.androidx.navigation.safeArgs
         classpath plugin.google.hilt
+        classpath plugin.google.secretsGradle
         classpath plugin.gradleVersions
+        classpath plugin.node
         classpath plugin.kotlin.gradle
         classpath plugin.square.exhaustive
         classpath plugin.square.sqlDelight
@@ -31,6 +33,7 @@ allprojects {
         maven { url "https://github.com/jitsi/jitsi-maven-repository/raw/master/releases" }
         maven { url 'https://jitpack.io' }
         maven { url "https://chaquo.com/maven" }
+        maven { url "https://plugins.gradle.org/m2/" }
     }
 
     tasks.withType(Test) {
@@ -44,19 +47,19 @@ allprojects {
 
     plugins.withId("com.android.library") {
         extensions.getByName("android").compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
+            sourceCompatibility JavaVersion.VERSION_17
+            targetCompatibility JavaVersion.VERSION_17
         }
     }
 
     plugins.withId("kotlin") {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
         kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_1_8
+            jvmTarget = JavaVersion.VERSION_17
             freeCompilerArgs += [
                     "-Xinline-classes",
                     "-Xopt-in=kotlin.RequiresOptIn",

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,13 @@
 # ChangeLog
 
+# Version 1.0.0-beta07 (2023-10-13)
+- Fixes for push notifications
+- Fixes on file attachments
+
+# Version 1.0.0-beta06 (2023-10-12)
+- Adds fixes to the payment endpoint
+- Adds a progress bar to the contact list on the dashboard
+
 # Version 1.0.0-beta05 (2023-09-25)
 - Adds fixes on phone signer
 

diff --git a/gradle.properties b/gradle.properties
@@ -36,22 +36,21 @@ kapt.use.worker.api=true
 kapt.include.compile.classpath=false
 # Enable In Logcat to determine Kapt
 #kapt.verbose=true
-android.bundle.enableUncompressedNativeLibs=false
 
-VERSION_NAME=1.0.0-beta05
+VERSION_NAME=1.0.0-beta07
 
 # The trailing 2 digits are for `alpha##` releases. For example:
 #     4.4.1-alpha02 = 441102 where `102` stands for alpha02
 #     4.4.1-beta01 = 441201 where `201` stands for beta01
 #     4.4.1-rc01 = 441301 where `301` stands for rc01
-VERSION_CODE=100205
+VERSION_CODE=100207
 
 
 # Kotlin-Android submodule
-KA_VERSION_NAME=1.0.0-beta05
+KA_VERSION_NAME=1.0.0-beta07
 
 # The trailing 2 digits are for `alpha##` releases. For example:
 #     4.4.1-alpha02 = 441102 where `102` stands for alpha02
 #     4.4.1-beta01 = 441201 where `201` stands for beta01
 #     4.4.1-rc01 = 441301 where `301` stands for rc01
-KA_VERSION_CODE=100205
+KA_VERSION_CODE=100207
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -3,23 +3,23 @@
 /*************************/
 ext.versions = [
     'buildTools': "30.0.3",
-    'compileSdk': 31,
+    'compileSdk': 33,
     'minSdk': 23,
-    'androidGradle': '4.2.2',
+    'androidGradle': '7.4.2',
     'arch': '2.1.0',
     'camera': '1.1.0-alpha10',
     'cameraView': '1.0.0-alpha30',
-    'coil': '1.3.0',
-    'coroutines': '1.5.1',
-    'insetter': '0.5.0',
-    'lifecycle'  : '2.3.1',
-    'hilt'       : '2.37',
+    'coil': '1.4.0',
+    'coroutines': '1.6.4',
+    'insetter': '0.6.1',
+    'lifecycle'  : '2.4.0',
+    'hilt'       : '2.42',
     'hiltJetpack': '1.0.0-alpha03',
-    'kotlin'     : '1.5.21',
-    'moshi'      : '1.12.0',
-    'navigation' : '2.3.5',
-    'okhttp'     : '4.9.1',
-    'sqlDelight' : '1.5.0',
+    'kotlin'     : '1.6.21',
+    'moshi'      : '1.13.0',
+    'navigation' : '2.5.3',
+    'okhttp'     : '4.10.0',
+    'sqlDelight' : '1.5.4',
     'toplAndroid': '2.1.2',
     'targetSdk'  : 33
 ]
@@ -51,7 +51,6 @@ ext.deps = [
         exifInterface: "androidx.exifinterface:exifinterface:1.3.2",
         lifecycle: [
             commonJava8: "androidx.lifecycle:lifecycle-common-java8:${versions.lifecycle}",
-            hilt: "androidx.hilt:hilt-lifecycle-viewmodel:${versions.hiltJetpack}",
             processLifecycleOwner: "androidx.lifecycle:lifecycle-process:${versions.lifecycle}",
             runtime: "androidx.lifecycle:lifecycle-runtime-ktx:${versions.lifecycle}",
             viewModel: "androidx.lifecycle:lifecycle-viewmodel-ktx:${versions.lifecycle}",
@@ -166,8 +165,10 @@ ext.plugin = [
     ],
     google: [
         hilt: "com.google.dagger:hilt-android-gradle-plugin:${versions.hilt}",
+        secretsGradle: "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
     ],
-    gradleVersions: "com.github.ben-manes:gradle-versions-plugin:0.39.0",
+    gradleVersions: "com.github.ben-manes:gradle-versions-plugin:0.42.0",
+    node: "com.github.node-gradle:gradle-node-plugin:7.0.1",
     kotlin: [
         dokka: "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1",
         gradle: "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -5,5 +5,5 @@ zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 
 # https://gradle.org/release-checksums/
-distributionSha256Sum=9bb8bc05f562f2d42bdf1ba8db62f6b6fa1c3bf6c392228802cc7cb0578fe7e0
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
+distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/kotlin-android b/kotlin-android
diff --git a/socket-io/client/build.gradle b/socket-io/client/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id 'com.github.node-gradle.node' version '3.1.0'
     id 'java-library'
     id 'kotlin'
+    id 'com.github.node-gradle.node'
 }
 
 node {

diff --git a/socket-io/engine/build.gradle b/socket-io/engine/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id 'com.github.node-gradle.node' version '3.1.0'
     id 'java-library'
     id 'kotlin'
+    id 'com.github.node-gradle.node'
 }
 
 node {

diff --git a/sphinx/activity/features/connectivity-helper/build.gradle b/sphinx/activity/features/connectivity-helper/build.gradle
@@ -10,8 +10,6 @@ android {
     defaultConfig {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode VERSION_CODE.toInteger()
-        versionName VERSION_NAME
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments disableAnalytics: 'true'
@@ -23,6 +21,7 @@ android {
             minifyEnabled false
         }
     }
+    namespace 'chat.sphinx.connectivity_helper'
 }
 
 dependencies {

diff --git a/sphinx/activity/features/connectivity-helper/src/main/AndroidManifest.xml b/sphinx/activity/features/connectivity-helper/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="chat.sphinx.connectivity_helper">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
diff --git a/sphinx/activity/features/signer-manager/build.gradle b/sphinx/activity/features/signer-manager/build.gradle
@@ -12,8 +12,6 @@ android {
     defaultConfig {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.compileSdk
-        versionCode VERSION_CODE.toInteger()
-        versionName VERSION_NAME
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments disableAnalytics: 'true'
@@ -25,6 +23,7 @@ android {
             minifyEnabled false
         }
     }
+    namespace 'chat.sphinx.signer_manager'
 }
 
 dependencies {
@@ -51,7 +50,6 @@ dependencies {
 
     implementation deps.jncryptor
 
-    implementation deps.androidx.lifecycle.hilt
     implementation deps.jna.sdk
     implementation deps.paho.sdk
     implementation deps.kotlinx.serialization

diff --git a/sphinx/activity/features/signer-manager/src/main/AndroidManifest.xml b/sphinx/activity/features/signer-manager/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="chat.sphinx.signer_manager"/>
+<manifest />
diff --git a/sphinx/activity/features/user-colors-helper/build.gradle b/sphinx/activity/features/user-colors-helper/build.gradle
@@ -11,8 +11,6 @@ android {
     defaultConfig {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode VERSION_CODE.toInteger()
-        versionName VERSION_NAME
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments disableAnalytics: 'true'
@@ -24,6 +22,7 @@ android {
             minifyEnabled false
         }
     }
+    namespace 'chat.sphinx.user_colors_helper'
 }
 
 dependencies {

diff --git a/sphinx/activity/features/user-colors-helper/src/main/AndroidManifest.xml b/sphinx/activity/features/user-colors-helper/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="chat.sphinx.user_colors_helper"/>
+<manifest />
diff --git a/sphinx/activity/features/video-player-controller/build.gradle b/sphinx/activity/features/video-player-controller/build.gradle
@@ -11,8 +11,6 @@ android {
     defaultConfig {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode VERSION_CODE.toInteger()
-        versionName VERSION_NAME
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments disableAnalytics: 'true'
@@ -24,6 +22,7 @@ android {
             minifyEnabled false
         }
     }
+    namespace 'chat.sphinx.video_player_controller'
 }
 
 dependencies {

diff --git a/sphinx/activity/features/video-player-controller/src/main/AndroidManifest.xml b/sphinx/activity/features/video-player-controller/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="chat.sphinx.video_player_controller">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/sphinx/activity/insetter-activity/build.gradle b/sphinx/activity/insetter-activity/build.gradle
@@ -10,8 +10,6 @@ android {
     defaultConfig {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode VERSION_CODE.toInteger()
-        versionName VERSION_NAME
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments disableAnalytics: 'true'
@@ -23,6 +21,7 @@ android {
             minifyEnabled false
         }
     }
+    namespace 'chat.sphinx.insetter_activity'
 }
 
 dependencies {

diff --git a/sphinx/activity/insetter-activity/src/main/AndroidManifest.xml b/sphinx/activity/insetter-activity/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="chat.sphinx.insetter_activity" />
+<manifest />
diff --git a/sphinx/activity/main/activitymain/build.gradle b/sphinx/activity/main/activitymain/build.gradle
@@ -14,8 +14,6 @@ android {
     defaultConfig {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode VERSION_CODE.toInteger()
-        versionName VERSION_NAME
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments disableAnalytics: 'true'
@@ -27,6 +25,7 @@ android {
             minifyEnabled false
         }
     }
+    namespace 'chat.sphinx.activitymain'
 }
 
 dependencies {
@@ -104,7 +103,6 @@ dependencies {
 
     implementation deps.chrisbanes.insetter
 
-    implementation deps.androidx.lifecycle.hilt
     implementation deps.google.hilt
     kapt kaptDeps.google.hilt
 

diff --git a/sphinx/activity/main/activitymain/src/main/AndroidManifest.xml b/sphinx/activity/main/activitymain/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="chat.sphinx.activitymain">
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application>
         <activity
+2 −2		.github/workflows/PR.yml
+6 −0		android/concepts/android-concept-views/build.gradle
+12 −12		gradle/dependencies.gradle
+2 −2		gradle/wrapper/gradle-wrapper.properties
+1 −3		sample/build.gradle