Merge pull request #6 from trading-point/update-dependencies

Update dependencies

Author: NaSOS

build.gradle

@@ -1,5 +1,3 @@
-apply from: 'scripts/dependency-updates.gradle'
-
 buildscript {
     apply from: 'scripts/dependencies.gradle'
 
@@ -12,6 +10,12 @@ buildscript {
     }
 }
 
+plugins {
+    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0"
+}
+
+apply from: 'scripts/dependency-updates.gradle'
+
 allprojects {
     repositories(repos)
 }

examples/build.gradle

@@ -1,15 +1,18 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'org.jetbrains.kotlin.plugin.compose'
 }
 
 android {
-    compileSdk 33
+    namespace = "com.xm.examples"
+
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.xm.examples"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -28,35 +31,32 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion "1.3.2"
+        jvmTarget = JavaVersion.VERSION_17
     }
 }
 
 dependencies {
     implementation project(':tka')
 
-    def appcompat_version = "1.6.0"
-    implementation "androidx.appcompat:appcompat:$appcompat_version"
+    implementation "androidx.appcompat:appcompat:1.6.1"
 
     implementation libraries.rx.java
     implementation "io.reactivex.rxjava3:rxkotlin:3.0.1"
     implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
 
-    implementation 'androidx.fragment:fragment-ktx:1.5.5'
+    implementation 'androidx.fragment:fragment-ktx:1.8.1'
 
     testImplementation libraries.junit
-    testImplementation 'org.mockito:mockito-core:5.0.0'
+    testImplementation 'org.mockito:mockito-core:5.12.0'
+
+    implementation "androidx.activity:activity-compose:1.9.0"
 
-    implementation "androidx.activity:activity-compose:1.6.1"
-    def compose_version = "1.3.1"
-    implementation "androidx.compose.foundation:foundation:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.compose.runtime:runtime-rxjava3:1.3.3"
+    implementation platform("androidx.compose:compose-bom:2024.06.00")
+    implementation "androidx.compose.foundation:foundation"
+    implementation "androidx.compose.material:material"
+    implementation "androidx.compose.runtime:runtime-rxjava3"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jan 16 16:13:35 EET 2023
+#Wed Jul 17 09:43:02 EEST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

scripts/dependencies.gradle

@@ -2,39 +2,38 @@ ext {
     //region Versions
     versions = [:]
     versions.sdk = [:]
-    versions.sdk.compatibility = "1.8"
+    versions.sdk.compatibility = JavaVersion.VERSION_17
     //endregion
 
     //region Libraries
     libraries = [:]
 
-    // https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md#1720
+    // https://github.com/JetBrains/kotlin/releases/tag/v2.0.0
     libraries.kotlin = [:]
-    libraries.kotlin.version = '1.7.20'
+    libraries.kotlin.version = '2.0.0'
     libraries.kotlin.jdk = "org.jetbrains.kotlin:kotlin-stdlib:${libraries.kotlin.version}"
 
     libraries.rx = [:]
 
-    // https://github.com/ReactiveX/RxJava/releases/tag/v3.1.5
-    libraries.rx.java = "io.reactivex.rxjava3:rxjava:3.1.5"
+    // https://github.com/ReactiveX/RxJava/releases/tag/v3.1.8
+    libraries.rx.java = "io.reactivex.rxjava3:rxjava:3.1.8"
 
     // https://github.com/junit-team/junit4/releases/tag/r4.13.2
     libraries.junit = "junit:junit:4.13.2"
 
-    // https://detekt.dev/changelog/#1220---2022-11-20
+    // https://detekt.dev/changelog/#1236---2024-03-23
     libraries.detekt = [:]
-    libraries.detekt.version = '1.22.0'
+    libraries.detekt.version = '1.23.6'
     libraries.detekt.formatting = "io.gitlab.arturbosch.detekt:detekt-formatting:${libraries.detekt.version}"
     //endregion
 
     //region Classpaths
     classpaths = [:]
-    // https://developer.android.com/studio/releases/gradle-plugin#7-1-2
-    classpaths.gradle = "com.android.tools.build:gradle:7.1.2"
+    // https://developer.android.com/studio/releases/gradle-plugin#8.4.0
+    classpaths.gradle = "com.android.tools.build:gradle:8.4.0"
     classpaths.kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${libraries.kotlin.version}"
     // https://github.com/ben-manes/gradle-versions-plugin/releases/tag/v0.44.0
     classpaths.versions = "com.github.ben-manes:gradle-versions-plugin:0.44.0"
-    // https://detekt.dev/changelog/#1220---2022-11-20
     classpaths.detekt = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${libraries.detekt.version}"
     //endregion
 

scripts/detekt.gradle

@@ -7,6 +7,7 @@ apply plugin: "io.gitlab.arturbosch.detekt"
 
 detekt {
     buildUponDefaultConfig = true
+    config = files("$projectDir/detekt/config.yml")
 
     reports {
         html.enabled = true

tka/detekt/config.yml

@@ -0,0 +1,3 @@
+formatting:
+  ImportOrdering:
+    active: false

tka/src/main/kotlin/com/xm/tka/Reducer.kt

@@ -216,6 +216,7 @@ interface ReduceContext<STATE, ACTION : Any> {
 /**
  * A function that accepts a State and an Action and produces a new state
  */
+@Suppress("ParameterListWrapping", "MaxLineLength")
 typealias Reduce<STATE, ACTION, ENVIRONMENT> = ReduceContext<STATE, ACTION>.(STATE, ACTION, ENVIRONMENT) -> Reduced<STATE, ACTION>
 
 /**

tka/src/main/kotlin/com/xm/tka/test/TestStore.kt

@@ -36,6 +36,7 @@ import java.util.LinkedList
  *
  *   Source: https://github.com/pointfreeco/swift-composable-architecture/blob/main/Sources/ComposableArchitecture/TestSupport/TestStore.swift
  */
+@Suppress("MaxLineLength")
 class TestStore<STATE : Any, LOCAL_STATE : Any, ACTION : Any, LOCAL_ACTION : Any, ENVIRONMENT : Any> private constructor(
     initialState: STATE,
     private val reducer: Reducer<STATE, ACTION, ENVIRONMENT>,
@@ -284,6 +285,7 @@ Unhandled actions: $receivedActions
             fun <STATE, LOCAL_STATE, ACTION, LOCAL_ACTION, ENVIRONMENT> `do`(
                 work: () -> Unit
             ): Step<STATE, LOCAL_STATE, ACTION, LOCAL_ACTION, ENVIRONMENT> =
+                @Suppress("Wrapping")
                 Step(Type.Environment { work(); it })
         }
     }

tka/src/test/kotlin/com/xm/tka/StoreTest.kt

@@ -174,9 +174,9 @@ class StoreTest {
             it
         }
 
-        val viewStore1 = ViewStore(store1)
-        val viewStore2 = ViewStore(store2)
-        val viewStore3 = ViewStore(store3)
+//        val viewStore1 = ViewStore(store1)
+//        val viewStore2 = ViewStore(store2)
+//        val viewStore3 = ViewStore(store3)
         val viewStore4 = ViewStore(store4)
 
         assertEquals(1, numCalls1)

tka/src/test/kotlin/com/xm/tka/test/TestStoreTestNew.kt

@@ -13,7 +13,6 @@ import com.xm.tka.test.TestStoreTestNew.Action.C1
 import com.xm.tka.test.TestStoreTestNew.Action.C2
 import com.xm.tka.test.TestStoreTestNew.Action.C3
 import com.xm.tka.test.TestStoreTestNew.Action.D
-import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Scheduler
 import io.reactivex.rxjava3.schedulers.TestScheduler
 import java.util.concurrent.TimeUnit