From f888426b971e7a92979d4a9debdecd2e8bb01a47 Mon Sep 17 00:00:00 2001 From: Hyukgyu Kwon <me@kwon.hk> Date: Mon, 15 Jan 2024 18:00:40 +0900 Subject: [PATCH] fix: delete build.gradle --- buildSrc/src/main/java/Dependencies.kt | 4 +- sdk/build.gradle | 171 ------------------------- sdk/build.gradle.kts | 21 ++- 3 files changed, 12 insertions(+), 184 deletions(-) delete mode 100644 sdk/build.gradle diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index bfb826b..2fbc439 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -1,8 +1,8 @@ // 디펜던시 업데이트 확인 ./gradlew dependencyUpdates object Versions { - const val versionCode = 231027000 // yymmdd000 - const val versionName = "1.4.1" // https://www.notion.so/chaifinance/QA-Process-d1a4be396337493b81c6e85fff2d5cd6 + const val versionCode = 240115000 // yymmdd000 + const val versionName = "1.4.2" // https://www.notion.so/chaifinance/QA-Process-d1a4be396337493b81c6e85fff2d5cd6 const val multidex = "2.0.1" const val kotlin_stdlib_jdk = "1.9.10" diff --git a/sdk/build.gradle b/sdk/build.gradle deleted file mode 100644 index cced538..0000000 --- a/sdk/build.gradle +++ /dev/null @@ -1,171 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' -apply plugin: 'kotlin-parcelize' -apply plugin: 'kotlinx-serialization' -apply plugin: 'maven-publish' - -android { - namespace 'com.iamport.sdk' - - compileSdk 34 - buildToolsVersion = '34.0.0' - - defaultConfig { - minSdkVersion 21 - targetSdk 34 - versionCode = Versions.versionCode // yymmdd000 - versionName = Versions.versionName // prod(x.y.z), dev(x.y.z-dev00), poc(x.y.z-poc00) - multiDexEnabled true - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - debug { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - repositories { - flatDir { - dirs 'libs' - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 - } - - buildFeatures { - dataBinding true - } - - lintOptions { - abortOnError false - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - testOptions { - unitTests { - includeAndroidResources = true - } - } -} - -afterEvaluate { - publishing { - publications { - // Creates a Maven publication called "release". - release(MavenPublication) { - from components.release - groupId = 'com.github.iamport' - artifactId = 'iamport-android' - version = Versions.versionName - } - } - } -} - -//// Because the components are created only during the afterEvaluate phase, you must -//// configure your publications using the afterEvaluate() lifecycle method. -//afterEvaluate { -// publishing { -// publications { -// // Creates a Maven publication called "release". -// release(MavenPublication) { -// // Applies the component for the release build variant. -// from components.release -// -// // You can then customize attributes of the publication as shown below. -// groupId = 'com.github.iamport' -// artifactId = 'iamport-android' -// version = Versions.versionName -// } -//// // Creates a Maven publication called “debug”. -//// debug(MavenPublication) { -//// // Applies the component for the debug build variant. -//// from components.debug -//// -//// groupId = 'com.github.iamport' -//// artifactId = 'iamport-android-debug' -//// version = Versions.versionName -//// } -// } -// } -//} - - -dependencies { - - implementation Libs.multidex - implementation Libs.kotlin_stdlib_jdk - implementation Libs.core_ktx - implementation Libs.appcompat - - testImplementation Libs.robolectric - testImplementation Libs.mokito_core - testImplementation Libs.mokito_inline - testImplementation Libs.mokito_android -// testImplementation Libs.mokito_kotlin - - testImplementation Libs.junit - androidTestImplementation Libs.testJunit - androidTestImplementation Libs.espresso_core - - testImplementation Libs.androidx_test -// androidTestImplementation Libs.androidx_test -// androidTestImplementation Libs.androidx_test_runner -// androidTestImplementation Libs.androidx_test_rules - - // Android Support/Architecture - implementation Libs.constraintlayout - implementation Libs.lifecycle_extensions - implementation Libs.lifecycle_viewmodel_ktx - implementation Libs.lifecycle_livedata_ktx - implementation Libs.lifecycle_common - implementation Libs.material - - implementation Libs.activity_ktx - implementation Libs.fragment_ktx - - implementation Libs.koin_core - testImplementation Libs.koin_test - testImplementation Libs.koin_test_junit4 - implementation Libs.koin_android - implementation Libs.koin_android_compat - implementation Libs.koin_android_compose - - // Retorofit - implementation Libs.retrofit - implementation Libs.converter_gson - implementation Libs.logging_interceptor - - // Gson - implementation Libs.gson - - // Logger - implementation Libs.logger - - // Rx - implementation Libs.rxjava - implementation Libs.rxandroid - implementation Libs.rxjava2_debug - - // loading animation - implementation Libs.spinKit - -// debugImplementation Libs.chuck -// releaseImplementation Libs.releaseChuck - - implementation Libs.serialization -} \ No newline at end of file diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts index 57ed369..ff051f5 100644 --- a/sdk/build.gradle.kts +++ b/sdk/build.gradle.kts @@ -9,14 +9,13 @@ plugins { android { - compileSdk = 30 - buildToolsVersion = "30.0.3" + namespace = "com.iamport.sdk" + + compileSdk = 34 + buildToolsVersion = "34.0.0" defaultConfig { minSdk = 21 - targetSdk = 30 -// versionCode = Versions.versionCode // yymmdd000 -// versionName = Versions.versionName // prod(x.y.z), dev(x.y.z-dev00), poc(x.y.z-poc00) multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" @@ -51,16 +50,16 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } -// buildFeatures { -// dataBinding = true -// } + buildFeatures { + dataBinding = true + } lint { - isAbortOnError = false + abortOnError = false } sourceSets {