From 572aa0aea392f938f9e1fc3575da1ec8df3d1b2a Mon Sep 17 00:00:00 2001
From: Bharath Vishal G <bharathvishalg@gmail.com>
Date: Sat, 29 Jun 2024 14:57:12 +0530
Subject: [PATCH] Development commit

- Upgraded gradle plugin to 8.5.0.
- Migrated build configuration files from Groovy to Kotlin.
- Migrated build to version catalogs (libs.versions.toml).
- Updated all internal dependencies.
---
 .idea/deploymentTargetSelector.xml            | 18 ++++
 .idea/kotlinc.xml                             |  2 +-
 app/build.gradle                              | 60 ------------
 app/build.gradle.kts                          | 92 +++++++++++++++++++
 app/proguard-rules.pro                        |  2 +-
 .../TextFileGeneratorFragment.kt              |  5 +
 build.gradle                                  | 26 ------
 build.gradle.kts                              |  6 ++
 gradle/libs.versions.toml                     | 52 +++++++++++
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 settings.gradle                               |  1 -
 settings.gradle.kts                           | 26 ++++++
 12 files changed, 202 insertions(+), 90 deletions(-)
 create mode 100644 .idea/deploymentTargetSelector.xml
 delete mode 100644 app/build.gradle
 create mode 100644 app/build.gradle.kts
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 create mode 100644 gradle/libs.versions.toml
 delete mode 100644 settings.gradle
 create mode 100644 settings.gradle.kts

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..66ebe93
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-06-29T09:24:27.231354Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/vishal/.android/avd/Medium_Phone_API_34.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index d68cb8d..3d103b7 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -4,6 +4,6 @@
     <option name="jvmTarget" value="11" />
   </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.23" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 169d3dc..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,60 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-android {
-    compileSdk 34
-
-    defaultConfig {
-        applicationId "com.bharathvishal.textfilegeneratorbenchmark"
-        minSdkVersion 23
-        targetSdkVersion 34
-        multiDexEnabled true
-        versionCode 91
-        vectorDrawables.useSupportLibrary = true
-        versionName "2.8"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildFeatures {
-        viewBinding true
-    }
-
-    buildTypes {
-        debug {
-            debuggable true
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-        release {
-            debuggable false
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-    namespace 'com.bharathvishal.textfilegeneratorbenchmark'
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.google.android.material:material:1.11.0'
-    implementation 'com.github.bumptech.glide:glide:4.16.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.5.2'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..e186043
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,92 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.compose.compiler)
+}
+
+android {
+    namespace = "com.bharathvishal.textfilegeneratorbenchmark"
+    compileSdk = 34
+    defaultConfig {
+        applicationId = "com.bharathvishal.textfilegeneratorbenchmark"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+        minSdk = 23
+        targetSdk = 34
+        versionCode = 95
+        versionName = "2.9"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildFeatures {
+        viewBinding = true
+        compose = true
+    }
+    buildTypes {
+        debug {
+            isDebuggable = true
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+        release {
+            isDebuggable = false
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.14"
+    }
+
+    packaging {
+        jniLibs {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.appcompat)
+    implementation(libs.jetbrains.kotlinx.couroutine)
+    implementation(libs.coil.kt)
+    implementation(libs.jetbrains.kotlin.stdlib)
+    implementation(libs.google.android.material)
+    implementation(libs.androidx.constraintlayout)
+    testImplementation(libs.junit)
+    implementation(libs.glide)
+    annotationProcessor(libs.glide.compiler)
+    androidTestImplementation(libs.androidx.espresso.core)
+    implementation(libs.androidx.cardview)
+    implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.material3.windowsize)
+    implementation(libs.androidx.compose.material3.windowsize)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.core.core.splashscreen)
+    implementation(libs.androidx.compose.material.material.icons)
+    implementation(libs.google.accompanist.accompanist)
+}
+
+
+
+
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index d7cb4c1..a066e67 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
diff --git a/app/src/main/java/com/bharathvishal/textfilegeneratorbenchmark/TextFileGeneratorFragment.kt b/app/src/main/java/com/bharathvishal/textfilegeneratorbenchmark/TextFileGeneratorFragment.kt
index 3b7f982..00963eb 100644
--- a/app/src/main/java/com/bharathvishal/textfilegeneratorbenchmark/TextFileGeneratorFragment.kt
+++ b/app/src/main/java/com/bharathvishal/textfilegeneratorbenchmark/TextFileGeneratorFragment.kt
@@ -206,6 +206,7 @@ class TextFileGeneratorFragment : Fragment(), CoroutineScope by MainScope() {
         var endNum: Int = endNum1
         var loopexecutionTimes = 0
 
+        @Deprecated("Deprecated in Java")
         @Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
         override fun doInBackground(vararg voids: Void): Void? {
             val context1 = contextRef.get()
@@ -304,6 +305,7 @@ class TextFileGeneratorFragment : Fragment(), CoroutineScope by MainScope() {
         }
 
 
+        @Deprecated("Deprecated in Java")
         override fun onCancelled(result: Void?) {
             super.onCancelled(result)
             val context1 = contextRef.get()
@@ -366,6 +368,7 @@ class TextFileGeneratorFragment : Fragment(), CoroutineScope by MainScope() {
             }
         }
 
+        @Deprecated("Deprecated in Java")
         @SuppressLint("SetTextI18n")
         override fun onPostExecute(aVoid: Void?) {
             super.onPostExecute(aVoid)
@@ -430,11 +433,13 @@ class TextFileGeneratorFragment : Fragment(), CoroutineScope by MainScope() {
             cancel(true)
         }
 
+        @Deprecated("Deprecated in Java")
         override fun onProgressUpdate(vararg progress: Int?) {
             super.onProgressUpdate(*progress)
             benchMarkProgress?.setMessage("Generating files, Please wait \nProgress : $filesAlreadyPresent/$totalCount")
         }
 
+        @Deprecated("Deprecated in Java")
         override fun onPreExecute() {
             val context1 = contextRef.get()
 
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 6a0e765..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    ext.kotlin_version = '1.9.23'
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-tasks.register('clean', Delete) {
-    delete rootProject.buildDir
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..f41eb6b
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,6 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.jetbrains.kotlin.android) apply false
+    alias(libs.plugins.compose.compiler) apply false
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..2786e11
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,52 @@
+[versions]
+agp = "8.5.0"
+appCompatVer="1.7.0"
+kotlinxCoroutinesVer="1.7.3"
+coilVer="2.6.0"
+kotlinVer = "2.0.0"
+materialVer = "1.12.0"
+constraintlayoutVer="2.1.4"
+coreKtxVer = "1.13.1"
+glideVer="4.16.0"
+cardViewVer="1.0.0"
+compose3MaterialVer="1.2.1"
+lifecycleRuntimeKtxVer="2.8.2"
+activityComposeVer="1.9.0"
+composeUItestVer="1.6.8"
+uitoolingVer="1.6.8"
+uitoolingpreviewVer="1.6.8"
+splashScreenVer="1.0.1"
+junitVersion = "4.13.2"
+materialiconsVer="1.6.8"
+espressoCoreVer = "3.6.1"
+accompanistVer = "0.28.0"
+
+
+[libraries]
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appCompatVer" }
+jetbrains-kotlinx-couroutine = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesVer" }
+coil-kt = { group = "io.coil-kt", name = "coil-compose", version.ref = "coilVer" }
+jetbrains-kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlinVer" }
+google-android-material = { group = "com.google.android.material", name = "material", version.ref = "materialVer" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayoutVer" }
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtxVer" }
+junit = { group = "junit", name = "junit", version.ref = "junitVersion" }
+glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glideVer" }
+glide-compiler = { group = "com.github.bumptech.glide", name = "compiler", version.ref = "glideVer" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCoreVer" }
+androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "cardViewVer" }
+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "compose3MaterialVer" }
+androidx-compose-material3-windowsize= { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "compose3MaterialVer" }
+androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtxVer" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityComposeVer" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4",version.ref="composeUItestVer" }
+androidx-compose-ui-tooling = { group = "androidx.compose.ui", name="ui-tooling",version.ref = "uitoolingVer" }
+androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name="ui-tooling-preview",version.ref = "uitoolingpreviewVer" }
+androidx-core-core-splashscreen= { group = "androidx.core", name = "core-splashscreen",version.ref="splashScreenVer" }
+androidx-compose-material-material-icons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "materialiconsVer" }
+google-accompanist-accompanist = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanistVer" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinVer" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlinVer" }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4ab1c10..541e20f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Feb 08 17:57:03 IST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index e7b4def..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..330d450
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,26 @@
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            setUrl("https://jitpack.io")
+        }
+    }
+}
+
+rootProject.name = "Text-File-Generator-Benchmark-for-Android"
+include(":app")