devol
/
smalltalk-matrix
mirror of https://github.com/ouchadam/small-talk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prepping for kotlin 1.7.0 release, removing compose from modules that don't need it

This commit is contained in:
Adam Brown 2022-06-11 13:29:47 +01:00
parent 716790712b
commit 4a0d2cd42d
14 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build.gradle
View File

@ -24,8 +24,8 @@ subprojects {
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs = [
'-Xopt-in=kotlin.contracts.ExperimentalContracts',
'-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
'-opt-in=kotlin.contracts.ExperimentalContracts',
'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
]
}
}
@ -52,7 +52,7 @@ ext.applyLibraryPlugins = { project ->
project.apply plugin: 'kotlin-android'
}
ext.androidSdkVersion = 31
ext.androidSdkVersion = 32
ext.applyCommonAndroidParameters = { project ->
def android = project.android
@ -66,11 +66,6 @@ ext.applyCommonAndroidParameters = { project ->
minSdkVersion 24
targetSdkVersion androidSdkVersion
}
android.buildFeatures.compose = true
android.composeOptions {
kotlinCompilerExtensionVersion = Dependencies.google.kotlinCompilerExtensionVersion
}
}
ext.applyLibraryModuleOptimisations = { project ->
@ -101,13 +96,23 @@ ext.applyCompose = { project ->
dependencies.implementation Dependencies.google.androidxComposeMaterial
dependencies.implementation Dependencies.google.androidxComposeIconsExtended
dependencies.implementation Dependencies.google.androidxActivityCompose
def android = project.android
android.buildFeatures.compose = true
android.composeOptions {
kotlinCompilerExtensionVersion = Dependencies.google.kotlinCompilerExtensionVersion
}
}
ext.applyAndroidComposeLibraryModule = { project ->
applyAndroidLibraryModule(project)
applyCompose(project)
}
ext.applyAndroidLibraryModule = { project ->
applyLibraryPlugins(project)
applyCommonAndroidParameters(project)
applyLibraryModuleOptimisations(project)
applyCompose(project)
}
ext.applyCrashlyticsIfRelease = { project ->

2
core/build.gradle
View File

@ -4,7 +4,7 @@ plugins {
}
dependencies {
implementation Dependencies.mavenCentral.kotlinCoroutinesCore
api Dependencies.mavenCentral.kotlinCoroutinesCore
testFixturesImplementation Dependencies.mavenCentral.kotlinCoroutinesCore
testFixturesImplementation Dependencies.mavenCentral.kluent
testFixturesImplementation Dependencies.mavenCentral.mockk

2
dependencies.gradle
View File

@ -90,7 +90,7 @@ ext.Dependencies.with {
def kotlinVer = "1.6.10"
def sqldelightVer = "1.5.3"
def composeVer = "1.1.0"
def composeVer = "1.1.1"
def ktorVer = "2.0.2"
google = new DependenciesContainer()

2
design-library/build.gradle
View File

@ -1,4 +1,4 @@
applyAndroidLibraryModule(project)
applyAndroidComposeLibraryModule(project)
dependencies {
implementation project(":core")

2
domains/android/core/build.gradle
View File

@ -1,4 +1,4 @@
applyAndroidLibraryModule(project)
applyAndroidComposeLibraryModule(project)
dependencies {
implementation project(":core")

2
features/directory/build.gradle
View File

@ -1,4 +1,4 @@
applyAndroidLibraryModule(project)
applyAndroidComposeLibraryModule(project)
dependencies {
implementation project(":matrix:services:sync")

2
features/home/build.gradle
View File

@ -1,4 +1,4 @@
applyAndroidLibraryModule(project)
applyAndroidComposeLibraryModule(project)
dependencies {
implementation project(":matrix:services:profile")

2
features/login/build.gradle
View File

@ -1,4 +1,4 @@
applyAndroidLibraryModule(project)
applyAndroidComposeLibraryModule(project)
dependencies {
implementation project(":domains:android:core")

2
features/messenger/build.gradle
View File

@ -1,4 +1,4 @@
applyAndroidLibraryModule(project)
applyAndroidComposeLibraryModule(project)
apply plugin: 'kotlin-parcelize'
dependencies {

2
features/profile/build.gradle
View File

@ -1,4 +1,4 @@
applyAndroidLibraryModule(project)
applyAndroidComposeLibraryModule(project)
dependencies {
implementation project(":matrix:services:sync")

2
features/settings/build.gradle
View File

@ -1,4 +1,4 @@
applyAndroidLibraryModule(project)
applyAndroidComposeLibraryModule(project)
dependencies {
implementation project(":matrix:services:sync")

2
features/verification/build.gradle
View File

@ -1,4 +1,4 @@
applyAndroidLibraryModule(project)
applyAndroidComposeLibraryModule(project)
dependencies {
implementation project(":matrix:services:crypto")

3
matrix/services/crypto/src/main/kotlin/app/dapk/st/matrix/crypto/internal/VerificationHandler.kt
View File

@ -182,6 +182,9 @@ internal class VerificationHandler(
sendToDevice(ToDevicePayload.VerificationDone(verificationTransaction.transactionId))
stateFlow.emit(Verification.State.Done)
}
is Verification.Event.Done -> {
// TODO
}
}
}

3
test-harness/src/test/kotlin/SmokeTest.kt
View File

@ -172,5 +172,8 @@ fun testAfterInitialSync(block: suspend MatrixTestScope.(TestMatrix, TestMatrix)
private fun Flow<Verification.State>.automaticVerification(testMatrix: TestMatrix) = this.onEach {
when (it) {
is Verification.State.WaitingForMatchConfirmation -> testMatrix.client.cryptoService().verificationAction(Verification.Action.AcknowledgeMatch)
else -> {
// do nothing
}
}
}