From f4a6d3c1ae34d0a7a5f7da2e2cc8bd62bd4a1da7 Mon Sep 17 00:00:00 2001
From: hoangchungk53qx1 <hoangchungk53qx1@gmail.com>
Date: Sun, 27 Aug 2023 04:12:31 +0700
Subject: [PATCH] upgrade gradle,example

---
 .idea/compiler.xml                            |  2 +-
 .idea/gradle.xml                              |  3 ++-
 .idea/kotlinc.xml                             |  6 ++++++
 .idea/misc.xml                                |  2 +-
 app/build.gradle                              | 20 ++++++++++---------
 .../java/vn/chungha/flow_bus/MainActivity.kt  |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 build.gradle                                  |  2 +-
 flow_bus_core/build.gradle                    | 18 ++++++++---------
 .../flow_bus_core/flow/FlowBusViewModel.kt    |  2 +-
 10 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index d520c5e..b057fa8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..69e8615
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.20" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 360e6d4..0ad17cb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index e752f30..5b17b3a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,17 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "vn.chungha.flow_bus"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0.4"
 
@@ -48,18 +50,18 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation project(":flow_bus_core")
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    implementation "androidx.activity:activity-ktx:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.5"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0'
+    implementation "androidx.activity:activity-ktx:1.7.2"
+    implementation "androidx.fragment:fragment-ktx:1.6.1"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
     implementation 'com.jakewharton.timber:timber:5.0.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 }
\ No newline at end of file
diff --git a/app/src/main/java/vn/chungha/flow_bus/MainActivity.kt b/app/src/main/java/vn/chungha/flow_bus/MainActivity.kt
index 69dfcfb..f3f62f5 100644
--- a/app/src/main/java/vn/chungha/flow_bus/MainActivity.kt
+++ b/app/src/main/java/vn/chungha/flow_bus/MainActivity.kt
@@ -25,7 +25,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun sendFlowBus() {
         binding.sendGlobal.setOnClickListener {
-            busEvent(GlobalEvent("Hello from MainActivity"))
+            busEvent(GlobalEvent("Hello from MainActivity with GlobalEvent"))
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e895d47..c13c8a1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
     <string name="send_event_sticky">send event sticky to third screen</string>
     <string name="main_activity">Main Activity</string>
     <string name="go_to_third_screen">go to third screen</string>
-    <string name="send_from_activity">send global from Activity</string>
+    <string name="send_from_activity">send global from Activity to Third Screen</string>
     <string name="send_sticky_from_activity">send sticky from Activity</string>
     <string name="third_screen">Third Screen</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 0a0ae43..45cd475 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.8.0"
+    ext.kotlin_version = "1.8.20"
     repositories {
         google()
         maven { url 'https://jitpack.io' }
diff --git a/flow_bus_core/build.gradle b/flow_bus_core/build.gradle
index 5903ade..499d227 100644
--- a/flow_bus_core/build.gradle
+++ b/flow_bus_core/build.gradle
@@ -8,11 +8,11 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
-        targetSdk 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -40,20 +40,20 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     // Lib Core
-    implementation 'androidx.activity:activity-ktx:1.6.1'
-    implementation 'androidx.fragment:fragment-ktx:1.5.5'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0'
+    implementation 'androidx.activity:activity-ktx:1.7.2'
+    implementation 'androidx.fragment:fragment-ktx:1.6.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
     implementation 'com.jakewharton.timber:timber:5.0.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 }
 
 afterEvaluate {
diff --git a/flow_bus_core/src/main/java/vn/chungha/flow_bus_core/flow/FlowBusViewModel.kt b/flow_bus_core/src/main/java/vn/chungha/flow_bus_core/flow/FlowBusViewModel.kt
index f3c5911..c729e3c 100644
--- a/flow_bus_core/src/main/java/vn/chungha/flow_bus_core/flow/FlowBusViewModel.kt
+++ b/flow_bus_core/src/main/java/vn/chungha/flow_bus_core/flow/FlowBusViewModel.kt
@@ -89,7 +89,7 @@ class FlowBusViewModel : ViewModel() {
     fun clearStickyEvent(stickyEvent: String) = stickyEventFlows[stickyEvent]?.resetReplayCache()
 
     @Suppress("UNCHECKED_CAST")
-    fun <T : Any> invokeReceived(value: Any, onReceived: (T) -> Unit) {
+    private fun <T : Any> invokeReceived(value: Any, onReceived: (T) -> Unit) {
         try {
             onReceived.invoke(value as T)
         } catch (e: ClassCastException) {