Skip to content

Commit 99f9df3

Browse files
authored
Merge pull request #126 from Trendyol/update-project-dependencies
Update project dependencies
2 parents 4040912 + 5fca08a commit 99f9df3

File tree

29 files changed

+313
-190
lines changed

29 files changed

+313
-190
lines changed

build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,3 @@ allprojects {
1919
maven("https://jitpack.io")
2020
}
2121
}
22-
23-
tasks.create<Delete>("clean") {
24-
delete(rootProject.buildDir)
25-
}

buildSrc/settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rootProject.name = "trendyol-android-ui-components-buildSrc"

buildSrc/src/main/kotlin/Configs.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
object Configs {
22

3-
const val compileSdkVersion = 33
3+
const val compileSdkVersion = 34
4+
const val targetSdkVersion = 34
45
const val minSdkVersion = 21
5-
const val targetSdkVersion = 33
6-
const val buildToolsVersion = "33.0.0"
6+
const val buildToolsVersion = "34.0.0"
77

88
const val applicationId = "com.trendyol.uicomponents"
99
}

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
object Dependencies {
22

3-
const val kotlinJDK = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61"
4-
53
const val coreKtx = "androidx.core:core-ktx:1.3.2"
64
const val appCompat = "androidx.appcompat:appcompat:1.2.0"
75
const val material = "com.google.android.material:material:1.4.0"

buildSrc/src/main/kotlin/Plugins.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
object Plugins {
22

3-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.3.1"
4-
const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
3+
private const val kotlinVersion = "2.0.0"
4+
const val androidGradlePlugin = "com.android.tools.build:gradle:8.5.0"
5+
const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
56

67
const val androidApplication = "com.android.application"
78
const val androidLibrary = "com.android.library"
89
const val kotlinAndroid = "kotlin-android"
910
const val kotlinKapt = "kotlin-kapt"
1011
const val kotlinParcelize = "kotlin-parcelize"
1112
const val mavenPublish = "publish"
13+
const val compose = "org.jetbrains.kotlin.plugin.compose"
14+
1215
}

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ org.gradle.configureondemand=true
55

66
android.useAndroidX=true
77
android.enableJetifier=true
8-
android.disableAutomaticComponentCreation=true
98

109
kapt.include.compile.classpath=false
1110
kapt.incremental.apt=false

gradle/wrapper/gradle-wrapper.jar

-15.4 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)