announcement close when action button is tapped

1Flow-Inc · Dec 3, 2024 · 338cc19 · 338cc19
1 parent 509746b
commit 338cc19
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.kotlin/errors/errors-1733210790623.log b/.kotlin/errors/errors-1733210790623.log
@@ -0,0 +1,4 @@
+kotlin version: 2.0.21
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+
diff --git a/app/build.gradle b/app/build.gradle
@@ -37,7 +37,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 34
         versionCode 65
-        versionName "2024.07.12"
+        versionName "2024.07.13"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -55,12 +55,12 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
     }
-//    kotlinOptions {
-//        jvmTarget = "17"
-//    }
     configurations {
         all { // You should exclude one of them not both of them
             exclude group: "com.android.support", module: "support-core-ui"

diff --git a/app/src/main/AndroidManifest.xml b/app/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="com.oneflow.analytics">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

diff --git a/app/src/main/java/com/oneflow/analytics/utils/OFConstants.java b/app/src/main/java/com/oneflow/analytics/utils/OFConstants.java
@@ -20,7 +20,7 @@
 
 public interface OFConstants {
 
-    String currentVersion = "2024.07.12";//2023.07.14;
+    String currentVersion = "2024.07.13";//2023.07.14;
     String MODE = "prod";//"dev";//"beta";//
 
     String PLATFORM = "Android";

diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.3.2"
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21'
         classpath "com.google.devtools.ksp:symbol-processing-gradle-plugin:2.0.21-1.0.27"
        // classpath 'com.google.gms:google-services:4.3.15'
         //classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"