Skip to content

Commit ce74033

Browse files
author
Targholi
committed
remove buildSrc and replace gradle catalog.
1 parent 7c8856f commit ce74033

File tree

10 files changed

+185
-249
lines changed

10 files changed

+185
-249
lines changed

.idea/gradle.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 53 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,52 +3,35 @@ plugins {
33
id("kotlin-android")
44
id("kotlin-android-extensions")
55
id("kotlin-kapt")
6-
id("dagger.hilt.android.plugin")
7-
id("androidx.navigation.safeargs.kotlin")
6+
id("com.google.dagger.hilt.android")
7+
id("androidx.navigation.safeargs")
88
}
99

1010
android {
11-
compileSdkVersion(AppConfig.compileSdk)
12-
// buildToolsVersion(AppConfig.buildToolsVersion)
11+
compileSdk = 31
1312

1413
defaultConfig {
15-
applicationId = AppConfig.applicationId
16-
minSdkVersion(AppConfig.minSdk)
17-
targetSdkVersion(AppConfig.targetSdk)
18-
versionCode = AppConfig.versionCode
19-
versionName = AppConfig.versionName
14+
applicationId = "com.milad.githoob"
15+
minSdk = 21
16+
targetSdk = 31
17+
versionCode = 1
18+
versionName = "1.0"
2019

21-
testInstrumentationRunner = AppConfig.androidTestInstrumentation
20+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2221
}
2322

2423
buildTypes {
2524
release {
26-
// minifyEnabled = false
27-
proguardFiles(
28-
getDefaultProguardFile("proguard-android-optimize.txt"),
29-
"proguard-rules.pro"
30-
)
25+
isMinifyEnabled = false
26+
// proguardFiles = getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
3127
}
3228
}
33-
34-
flavorDimensions(AppConfig.dimension)
35-
productFlavors {
36-
create("staging") {
37-
applicationIdSuffix = ".staging"
38-
setDimension(AppConfig.dimension)
39-
}
40-
41-
create("production") {
42-
setDimension(AppConfig.dimension)
43-
}
44-
}
45-
4629
compileOptions {
4730
sourceCompatibility = JavaVersion.VERSION_1_8
4831
targetCompatibility = JavaVersion.VERSION_1_8
4932
}
5033
kotlinOptions {
51-
jvmTarget = AppConfig.jvmTarget
34+
jvmTarget = "1.8"
5235
}
5336
buildFeatures {
5437
viewBinding = true
@@ -57,10 +40,45 @@ android {
5740
}
5841

5942
dependencies {
60-
// implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
61-
implementation(AppDependencies.appLibraries)
62-
kapt(AppDependencies.kaptLibraries)
63-
// annotationProcessor(AppDependencies.annotationLibraries)
64-
testImplementation(AppDependencies.testLibraries)
65-
androidTestImplementation(AppDependencies.androidTestLibraries)
43+
44+
implementation(libs.coreKtx)
45+
implementation(libs.appcompat)
46+
implementation(libs.material)
47+
implementation(libs.constraintLayout)
48+
implementation(libs.navigationFragment)
49+
implementation(libs.navigationUi)
50+
implementation(libs.coroutinesCore)
51+
implementation(libs.coroutinesAndroid)
52+
implementation(libs.legacy)
53+
implementation(libs.recyclerview)
54+
testImplementation(libs.junit)
55+
androidTestImplementation(libs.extJUnit)
56+
androidTestImplementation(libs.espressoCore)
57+
58+
implementation(libs.lifecycleViewmodel)
59+
implementation(libs.lifecycleRuntime)
60+
implementation(libs.lifecycleLivedata)
61+
implementation(libs.lifecycleExtensions)
62+
63+
implementation(libs.activity)
64+
implementation(libs.lifecycleArch)
65+
implementation(libs.gson)
66+
implementation(libs.retrofit)
67+
implementation(libs.retrofitGson)
68+
implementation(libs.okhttpLogging)
69+
70+
implementation(libs.hilt.android)
71+
kapt(libs.hilt.compiler)
72+
kapt(libs.hilt.ext.compiler)
73+
// implementation("androidx.hilt:hilt-lifecycle-viewmodel:1.0.0")
74+
// implementation("androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03")
75+
76+
implementation(libs.glide)
77+
implementation(libs.glide.compiler)
78+
implementation(libs.glide.transformations)
79+
implementation(libs.datastore)
80+
implementation(libs.markwon.core)
81+
implementation(libs.markwon.html)
82+
implementation(libs.markwon.image)
83+
implementation(libs.timber)
6684
}

build.gradle.kts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ buildscript {
33
repositories {
44
google()
55
mavenCentral()
6+
7+
maven { url = uri("../githoob-prebuilts/m2repository") }
68
}
7-
dependencies {
8-
classpath("com.android.tools.build:gradle:${Versions.gradle}")
9-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
10-
classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}")
11-
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.safeArgs}")
12-
}
9+
}
10+
11+
plugins {
12+
alias(libs.plugins.android.application) apply false
13+
alias(libs.plugins.kotlin.jvm) apply false
14+
alias(libs.plugins.hilt) apply false
15+
alias(libs.plugins.safearges) apply false
1316
}
1417

1518
tasks {

buildSrc/build.gradle.kts

Lines changed: 0 additions & 9 deletions
This file was deleted.

buildSrc/src/main/java/AppConfig.kt

Lines changed: 0 additions & 14 deletions
This file was deleted.

buildSrc/src/main/java/AppDependencies.kt

Lines changed: 0 additions & 133 deletions
This file was deleted.

buildSrc/src/main/java/Versions.kt

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)