Update project dependencies

mert.yuksel · mert.yuksel · commit 8729b236b2f9 · 2024-08-02T15:20:28.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,7 +19,3 @@ allprojects {
         maven("https://jitpack.io")
     }
 }
-
-tasks.create<Delete>("clean") {
-    delete(rootProject.buildDir)
-}
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "trendyol-android-ui-components-buildSrc"
diff --git a/buildSrc/src/main/kotlin/Configs.kt b/buildSrc/src/main/kotlin/Configs.kt
@@ -1,9 +1,9 @@
 object Configs {
 
-    const val compileSdkVersion = 33
+    const val compileSdkVersion = 34
+    const val targetSdkVersion = 34
     const val minSdkVersion = 21
-    const val targetSdkVersion = 33
-    const val buildToolsVersion = "33.0.0"
+    const val buildToolsVersion = "34.0.0"
 
     const val applicationId = "com.trendyol.uicomponents"
 }
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,7 +1,5 @@
 object Dependencies {
 
-    const val kotlinJDK = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61"
-
     const val coreKtx = "androidx.core:core-ktx:1.3.2"
     const val appCompat = "androidx.appcompat:appcompat:1.2.0"
     const val material = "com.google.android.material:material:1.4.0"
diff --git a/buildSrc/src/main/kotlin/Plugins.kt b/buildSrc/src/main/kotlin/Plugins.kt
@@ -1,12 +1,15 @@
 object Plugins {
 
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.3.1"
-    const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
+    private const val kotlinVersion = "2.0.0"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:8.5.0"
+    const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
     const val androidApplication = "com.android.application"
     const val androidLibrary = "com.android.library"
     const val kotlinAndroid = "kotlin-android"
     const val kotlinKapt = "kotlin-kapt"
     const val kotlinParcelize = "kotlin-parcelize"
     const val mavenPublish = "publish"
+    const val compose = "org.jetbrains.kotlin.plugin.compose"
+
 }
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,6 @@ org.gradle.configureondemand=true
 
 android.useAndroidX=true
 android.enableJetifier=true
-android.disableAutomaticComponentCreation=true
 
 kapt.include.compile.classpath=false
 kapt.incremental.apt=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libraries/card-input-view/build.gradle.kts b/libraries/card-input-view/build.gradle.kts
@@ -4,13 +4,14 @@ plugins {
     id(Plugins.mavenPublish)
 }
 
+kotlin.jvmToolchain(17)
+
 android {
     compileSdk = Configs.compileSdkVersion
     buildToolsVersion = Configs.buildToolsVersion
 
     defaultConfig {
         minSdk = Configs.minSdkVersion
-        targetSdk = Configs.targetSdkVersion
 
         vectorDrawables.useSupportLibrary = true
     }
@@ -32,14 +33,12 @@ android {
     buildFeatures.viewBinding = true
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 
 dependencies {
-    implementation(Dependencies.kotlinJDK)
-
     implementation(Dependencies.coreKtx)
     implementation(Dependencies.constraintLayout)
     implementation(Dependencies.material)
diff --git a/libraries/dialogs/build.gradle.kts b/libraries/dialogs/build.gradle.kts
@@ -13,7 +13,6 @@ android {
 
     defaultConfig {
         minSdk = Configs.minSdkVersion
-        targetSdk = Configs.targetSdkVersion
         vectorDrawables.useSupportLibrary = true
 
         consumerProguardFiles("consumer-rules.pro")
@@ -36,10 +35,14 @@ android {
     }
 
     namespace = "com.trendyol.dialog"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
-    implementation(Dependencies.kotlinJDK)
     implementation(Dependencies.appCompat)
     implementation(Dependencies.coreKtx)
     implementation(Dependencies.material)
diff --git a/libraries/fit-option-message-view/build.gradle.kts b/libraries/fit-option-message-view/build.gradle.kts
@@ -4,13 +4,14 @@ plugins {
     id(Plugins.mavenPublish)
 }
 
+kotlin.jvmToolchain(17)
+
 android {
     compileSdk = Configs.compileSdkVersion
     buildToolsVersion = Configs.buildToolsVersion
 
     defaultConfig {
         minSdk = Configs.minSdkVersion
-        targetSdk = Configs.targetSdkVersion
         vectorDrawables.useSupportLibrary = true
 
         consumerProguardFiles("consumer-rules.pro")
@@ -28,10 +29,14 @@ android {
     }
 
     namespace = "com.trendyol.fitoptionmessageview"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
-    implementation(Dependencies.kotlinJDK)
     implementation(Dependencies.appCompat)
     implementation(Dependencies.coreKtx)
 }
diff --git a/libraries/image-slider/build.gradle.kts b/libraries/image-slider/build.gradle.kts
@@ -4,13 +4,14 @@ plugins {
     id(Plugins.mavenPublish)
 }
 
+kotlin.jvmToolchain(17)
+
 android {
     compileSdk = Configs.compileSdkVersion
     buildToolsVersion = Configs.buildToolsVersion
 
     defaultConfig {
         minSdk = Configs.minSdkVersion
-        targetSdk = Configs.targetSdkVersion
         vectorDrawables.useSupportLibrary = true
 
         consumerProguardFiles("consumer-rules.pro")
@@ -29,10 +30,15 @@ android {
 
     buildFeatures.viewBinding = true
     namespace = "com.trendyol.uicomponents.imageslider"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+
+    }
 }
 
 dependencies {
-    implementation(Dependencies.kotlinJDK)
     implementation(Dependencies.appCompat)
     implementation(Dependencies.coreKtx)
     implementation(Dependencies.circleIndicator)
diff --git a/libraries/phonenumber/build.gradle.kts b/libraries/phonenumber/build.gradle.kts
@@ -5,13 +5,14 @@ plugins {
     id(Plugins.mavenPublish)
 }
 
+kotlin.jvmToolchain(17)
+
 android {
     compileSdk = Configs.compileSdkVersion
     buildToolsVersion = Configs.buildToolsVersion
 
     defaultConfig {
         minSdk = Configs.minSdkVersion
-        targetSdk = Configs.targetSdkVersion
         vectorDrawables.useSupportLibrary = true
 
         consumerProguardFiles("consumer-rules.pro")
@@ -29,6 +30,11 @@ android {
     }
 
     namespace = "com.trendyol.uicomponents.phonenumber"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
diff --git a/libraries/phonenumber/src/main/java/com/trendyol/uicomponents/phonenumber/PhoneNumberTextInputEditText.kt b/libraries/phonenumber/src/main/java/com/trendyol/uicomponents/phonenumber/PhoneNumberTextInputEditText.kt
@@ -11,6 +11,7 @@ import android.text.InputType
 import android.text.TextWatcher
 import android.util.AttributeSet
 import androidx.core.os.bundleOf
+import com.google.android.material.R as MaterialR
 import com.google.android.material.textfield.TextInputEditText
 
 class PhoneNumberTextInputEditText : TextInputEditText {
@@ -22,7 +23,7 @@ class PhoneNumberTextInputEditText : TextInputEditText {
 
     constructor(context: Context) : this(context, null)
 
-    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, R.attr.editTextStyle)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, MaterialR.attr.editTextStyle)
 
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
         context,
diff --git a/libraries/quantity-picker-view/build.gradle.kts b/libraries/quantity-picker-view/build.gradle.kts
@@ -4,13 +4,14 @@ plugins {
     id(Plugins.mavenPublish)
 }
 
+kotlin.jvmToolchain(17)
+
 android {
     compileSdk = Configs.compileSdkVersion
     buildToolsVersion = Configs.buildToolsVersion
 
     defaultConfig {
         minSdk = Configs.minSdkVersion
-        targetSdk = Configs.targetSdkVersion
         vectorDrawables.useSupportLibrary = true
 
         consumerProguardFiles("consumer-rules.pro")
@@ -29,10 +30,14 @@ android {
 
     buildFeatures.viewBinding = true
     namespace = "com.trendyol.uicomponents.quantitypickerview"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
-    implementation(Dependencies.kotlinJDK)
     implementation(Dependencies.appCompat)
     implementation(Dependencies.coreKtx)
     implementation(Dependencies.material)
diff --git a/libraries/quantity-picker-view/src/main/java/com/trendyol/uicomponents/quantitypickerview/QuantityPickerView.kt b/libraries/quantity-picker-view/src/main/java/com/trendyol/uicomponents/quantitypickerview/QuantityPickerView.kt
@@ -207,7 +207,7 @@ class QuantityPickerView : ConstraintLayout {
             val text = it.getString(R.styleable.QuantityPickerView_qpv_text) ?: ""
             val textColor = it.getColor(
                 R.styleable.QuantityPickerView_qpv_textColor,
-                context.themeColor(R.attr.colorAccent)
+                context.themeColor(com.google.android.material.R.attr.colorAccent)
             )
             val textSize =
                 it.getDimensionPixelSize(
@@ -218,7 +218,7 @@ class QuantityPickerView : ConstraintLayout {
             val quantityTextColor =
                 it.getColor(
                     R.styleable.QuantityPickerView_qpv_quantityTextColor,
-                    context.themeColor(R.attr.colorPrimary)
+                    context.themeColor(com.google.android.material.R.attr.colorPrimary)
                 )
             val quantityTextSize =
                 it.getDimensionPixelSize(
@@ -238,7 +238,7 @@ class QuantityPickerView : ConstraintLayout {
             val progressTintColor =
                 it.getColor(
                     R.styleable.QuantityPickerView_android_progressTint,
-                    context.themeColor(R.attr.colorPrimary)
+                    context.themeColor(com.google.android.material.R.attr.colorPrimary)
                 )
             val removeIcon = it.getDrawable(R.styleable.QuantityPickerView_qpv_removeIcon)
                 ?: AppCompatResources.getDrawable(context, R.drawable.qpv_ic_default_remove)!!
diff --git a/libraries/rating-bar-compose/build.gradle.kts b/libraries/rating-bar-compose/build.gradle.kts
@@ -2,16 +2,17 @@ plugins {
     id(Plugins.androidLibrary)
     id(Plugins.kotlinAndroid)
     id(Plugins.mavenPublish)
+    id(Plugins.compose) version "2.0.0"
 }
 
+kotlin.jvmToolchain(17)
+
 android {
     namespace = "com.trendyol.ratingbarcompose"
     compileSdk = 33
 
     defaultConfig {
         minSdk = Configs.minSdkVersion
-        targetSdk = Configs.targetSdkVersion
-
         vectorDrawables.useSupportLibrary = true
     }
 
diff --git a/libraries/rating-bar/build.gradle.kts b/libraries/rating-bar/build.gradle.kts
@@ -4,13 +4,14 @@ plugins {
     id(Plugins.mavenPublish)
 }
 
+kotlin.jvmToolchain(17)
+
 android {
     compileSdk = Configs.compileSdkVersion
     buildToolsVersion = Configs.buildToolsVersion
 
     defaultConfig {
         minSdk = Configs.minSdkVersion
-        targetSdk = Configs.targetSdkVersion
         vectorDrawables.useSupportLibrary = true
 
         consumerProguardFiles("consumer-rules.pro")
@@ -29,6 +30,11 @@ android {
 
     namespace = "com.trendyol.uicomponents.ratingbar"
     buildFeatures.viewBinding = true
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
diff --git a/libraries/suggestion-input-view/build.gradle.kts b/libraries/suggestion-input-view/build.gradle.kts
@@ -5,13 +5,14 @@ plugins {
     id(Plugins.mavenPublish)
 }
 
+kotlin.jvmToolchain(17)
+
 android {
     compileSdk = Configs.compileSdkVersion
     buildToolsVersion = Configs.buildToolsVersion
 
     defaultConfig {
         minSdk = Configs.minSdkVersion
-        targetSdk = Configs.targetSdkVersion
         vectorDrawables.useSupportLibrary = true
 
         consumerProguardFiles("consumer-rules.pro")
@@ -30,10 +31,14 @@ android {
 
     namespace = "com.trendyol.suggestioninputview"
     buildFeatures.viewBinding = true
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
-    implementation(Dependencies.kotlinJDK)
     implementation(Dependencies.appCompat)
     implementation(Dependencies.coreKtx)
     implementation(Dependencies.recyclerView)
diff --git a/libraries/timeline-view-compose/build.gradle.kts b/libraries/timeline-view-compose/build.gradle.kts
@@ -2,16 +2,17 @@ plugins {
     id(Plugins.androidLibrary)
     id(Plugins.kotlinAndroid)
     id(Plugins.mavenPublish)
+    id(Plugins.compose) version "2.0.0"
 }
 
+kotlin.jvmToolchain(17)
+
 android {
     namespace = "com.trendyol.timelineviewcompose"
     compileSdk = 33
 
     defaultConfig {
         minSdk = Configs.minSdkVersion
-        targetSdk = Configs.targetSdkVersion
-
         vectorDrawables.useSupportLibrary = true
     }
 
diff --git a/libraries/timeline-view/build.gradle.kts b/libraries/timeline-view/build.gradle.kts
diff --git a/libraries/toolbar/build.gradle.kts b/libraries/toolbar/build.gradle.kts
diff --git a/libraries/touch-delegator/build.gradle.kts b/libraries/touch-delegator/build.gradle.kts
diff --git a/sample-compose/build.gradle.kts b/sample-compose/build.gradle.kts
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
diff --git a/sample/src/main/java/com/trendyol/uicomponents/DialogsActivity.kt b/sample/src/main/java/com/trendyol/uicomponents/DialogsActivity.kt
diff --git a/sample/src/main/java/com/trendyol/uicomponents/QuantityPickerViewActivity.kt b/sample/src/main/java/com/trendyol/uicomponents/QuantityPickerViewActivity.kt

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,3 @@ allprojects {`
`19`	`19`	`maven("https://jitpack.io")`
`20`	`20`	`}`
`21`	`21`	`}`
`22`		`-`
`23`		`-tasks.create<Delete>("clean") {`
`24`		`- delete(rootProject.buildDir)`
`25`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+rootProject.name = "trendyol-android-ui-components-buildSrc"`