From a62fb0eb6b8c342d61d308c7e3eec53fe9ff7ec3 Mon Sep 17 00:00:00 2001 From: Farshid Date: Tue, 7 Jul 2026 15:59:21 +0330 Subject: [PATCH] Refactor: Bump Kotlin, Gradle, Cleanup .idea dir, Migration from groovy to Kotlin DSL and Version catalog --- .gitignore | 2 + .idea/codeStyles/Project.xml | 119 ------------------ .idea/codeStyles/codeStyleConfig.xml | 5 - .idea/compiler.xml | 6 - .idea/dictionaries/shadowalker.xml | 7 -- .idea/gradle.xml | 23 ---- .idea/jarRepositories.xml | 30 ----- .idea/misc.xml | 54 -------- .idea/runConfigurations.xml | 13 -- .idea/vcs.xml | 6 - app/build.gradle | 34 ----- app/build.gradle.kts | 43 +++++++ app/proguard-rules.pro | 2 +- app/src/main/AndroidManifest.xml | 15 ++- .../ir/ayantech/networking/MainActivity.kt | 44 ++++--- ayannetworking/build.gradle | 37 ------ ayannetworking/build.gradle.kts | 30 +++++ ayannetworking/proguard-rules.pro | 2 +- build.gradle | 27 ---- build.gradle.kts | 6 + gradle/libs.versions.toml | 34 +++++ gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 30 ++++- 23 files changed, 181 insertions(+), 390 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/dictionaries/shadowalker.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/runConfigurations.xml delete mode 100644 .idea/vcs.xml delete mode 100644 app/build.gradle create mode 100644 app/build.gradle.kts delete mode 100644 ayannetworking/build.gradle create mode 100644 ayannetworking/build.gradle.kts delete mode 100644 build.gradle create mode 100644 build.gradle.kts create mode 100644 gradle/libs.versions.toml diff --git a/.gitignore b/.gitignore index fd45b12..ecf372d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /build /captures .externalNativeBuild +/.idea/ +/.kotlin/ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index ce889bd..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index fb7f4a8..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/dictionaries/shadowalker.xml b/.idea/dictionaries/shadowalker.xml deleted file mode 100644 index b2139f0..0000000 --- a/.idea/dictionaries/shadowalker.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - ayan - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index f007d6e..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index e34606c..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 53a38ab..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index e497da9..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle deleted file mode 100644 index 9292fbb..0000000 --- a/app/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' - -android { - compileSdkVersion 33 - defaultConfig { - applicationId "ir.ayantech.networking" - minSdkVersion 16 - targetSdkVersion 33 - versionCode 1 - versionName "1.0" - testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { -// implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.github.shadowalker77:generator:0.1.3' - kapt 'com.github.shadowalker77:generator:0.1.3' - implementation project(':ayannetworking') - -// implementation project(':generator') -// kapt project(':generator') -} diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..75d34e4 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.ksp) +} + +android { + namespace = "ir.ayantech.networking" + compileSdk { + version = release(36) { + minorApiLevel = 1 + } + } + defaultConfig { + applicationId = "ir.ayantech.networking" + minSdk = 21 + targetSdk = 35 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + optimization { + enable = false + } + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + buildFeatures { + viewBinding = true + } +} + +dependencies { + implementation(libs.kotlin.stdlib) + implementation(libs.androidx.appcompat) + implementation(libs.generator) + implementation(project(":ayannetworking")) +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f1b4245..2f9dc5a 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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 28b9ba2..b32451f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ + package="ir.ayantech.networking"> + - + + - + - + diff --git a/app/src/main/java/ir/ayantech/networking/MainActivity.kt b/app/src/main/java/ir/ayantech/networking/MainActivity.kt index c3ce99f..7863f31 100644 --- a/app/src/main/java/ir/ayantech/networking/MainActivity.kt +++ b/app/src/main/java/ir/ayantech/networking/MainActivity.kt @@ -2,24 +2,18 @@ package ir.ayantech.networking import android.os.Bundle import android.util.Log +import android.widget.Button import androidx.appcompat.app.AppCompatActivity import ir.ayantech.ayannetworking.api.ApiCache import ir.ayantech.ayannetworking.api.AyanApi import ir.ayantech.ayannetworking.api.AyanCommonCallStatus import ir.ayantech.ayannetworking.api.WrappedPackage import ir.ayantech.ayannetworking.helper.dePent -import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { private lateinit var ayanApi: AyanApi - private var ayanCommonCallingStatus = AyanCommonCallStatus { - changeStatus { Log.d("AyanLog", it.name) } - failure { failure -> - Log.d("AyanLog", failure.failureMessage) - retryBtn.setOnClickListener { failure.reCallApi() } - } - } + private var wrappedPackage: WrappedPackage<*, GetEndUserInquiryHistoryDetail.Output>? = null @@ -27,6 +21,17 @@ class MainActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + val ayanCommonCallingStatus = AyanCommonCallStatus { + changeStatus { Log.d("AyanLog", it.name) } + failure { failure -> + Log.d("AyanLog", failure.failureMessage) + findViewById