feature add java 17, gradle 8 support
This commit is contained in:
parent
09ce885353
commit
ff825e3174
|
|
@ -1,10 +1,10 @@
|
|||
apply plugin: 'kotlin-android'
|
||||
|
||||
rootProject.ext {
|
||||
compileSdk = 29
|
||||
compileSdk = 33
|
||||
|
||||
minSdk = 21
|
||||
targetSdk = 29
|
||||
targetSdk = 33
|
||||
}
|
||||
|
||||
android {
|
||||
|
|
@ -16,12 +16,12 @@ android {
|
|||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = JavaVersion.VERSION_1_8.toString()
|
||||
jvmTarget = JavaVersion.VERSION_17.toString()
|
||||
}
|
||||
|
||||
buildFeatures {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.templates.logansquare"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(":utils")
|
||||
implementation project(":logging")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.extensions"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "androidx.recyclerview:recyclerview"
|
||||
implementation "androidx.fragment:fragment-ktx"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.lifecycle.rx"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api project(":utils")
|
||||
api project(":logging")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.lifecycle_viewcontroller"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(":lifecycle")
|
||||
implementation project(":navigation-viewcontroller")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.lifecycle"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly "javax.inject:javax.inject:1"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,17 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.livedata.location"
|
||||
}
|
||||
|
||||
configurations.configureEach {
|
||||
resolutionStrategy.eachDependency {
|
||||
if (requested.name == "agconnect-core") {
|
||||
useVersion(libs.versions.agconnectCore.get())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api project(":lifecycle")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.roboswag.core.log"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "androidx.annotation:annotation"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,20 @@ apply from: "../android-configs/lib-config.gradle"
|
|||
apply plugin: 'kotlin-kapt'
|
||||
|
||||
android {
|
||||
buildFeatures.viewBinding = true
|
||||
namespace "ru.touchin.roboswag.navigation_base"
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = JavaVersion.VERSION_17.toString()
|
||||
}
|
||||
|
||||
buildFeatures {
|
||||
viewBinding true
|
||||
buildConfig true
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,23 @@ apply from: "../android-configs/lib-config.gradle"
|
|||
|
||||
apply plugin: 'kotlin-kapt'
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.roboswag.navigation_viewcontroller"
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = JavaVersion.VERSION_17.toString()
|
||||
}
|
||||
|
||||
buildFeatures {
|
||||
viewBinding true
|
||||
buildConfig true
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(":utils")
|
||||
implementation project(":logging")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.roboswag.recyclerview_adapters"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(':kotlin-extensions')
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.calendar"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(":logging")
|
||||
implementation 'net.danlew:android.joda'
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.extensions.rx"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(":utils")
|
||||
implementation project(":logging")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.core.observables.storable"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(":utils")
|
||||
implementation project(":logging")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
apply from: "../android-configs/lib-config.gradle"
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.roboswag.core.utils"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(':kotlin-extensions')
|
||||
implementation "androidx.core:core"
|
||||
|
|
|
|||
|
|
@ -2,8 +2,11 @@ apply from: "../android-configs/lib-config.gradle"
|
|||
apply plugin: 'kotlin-android'
|
||||
|
||||
android {
|
||||
namespace "ru.touchin.roboswag.views"
|
||||
|
||||
buildFeatures {
|
||||
viewBinding true
|
||||
buildConfig true
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue