feature add java 17, gradle 8 support #8

Merged
sergey.vlasenko merged 2 commits from gradle_8 into feature/gradle_8_support 2024-03-06 23:53:22 +03:00
17 changed files with 96 additions and 7 deletions

View File

@ -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 {

View File

@ -1,5 +1,9 @@
apply from: "../android-configs/lib-config.gradle"
android {
namespace "ru.touchin.templates.logansquare"
}
dependencies {
implementation project(":utils")
implementation project(":logging")

View File

@ -75,7 +75,7 @@ abstract class BaseBottomNavigationController<TNavigationTab : BaseNavigationTab
// Detach current primary fragment
fragmentManager.primaryNavigationFragment?.let(transaction::detach)
val fragmentName = "tabClass.canonicalName"
val fragmentName = tabClass.canonicalName
Review

Взято из моего старого коммита, где я пытался пофиксить проблему капта, это запушили, забыв убрать кавычки

Взято из моего старого коммита, где я пытался пофиксить проблему капта, это запушили, забыв убрать кавычки
var fragment = fragmentManager.findFragmentByTag(fragmentName)
if (state == null && fragment != null) {

View File

@ -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"

View File

@ -1,5 +1,9 @@
apply from: "../android-configs/lib-config.gradle"
android {
namespace "ru.touchin.lifecycle.rx"
}
dependencies {
api project(":utils")
api project(":logging")

View File

@ -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")

View File

@ -1,5 +1,9 @@
apply from: "../android-configs/lib-config.gradle"
android {
namespace "ru.touchin.lifecycle"
}
dependencies {
compileOnly "javax.inject:javax.inject:1"

View File

@ -1,5 +1,17 @@
apply from: "../android-configs/lib-config.gradle"
android {
namespace "ru.touchin.livedata.location"
}
configurations.configureEach {
resolutionStrategy.eachDependency {
Review

В строчках ниже тянется либа com.huawei.hms:location, которая в свою очередь тянет agconnect-core старой, не поддерживающей gradle 8 версии, из-за чего не собирается билд.

В строчках ниже тянется либа `com.huawei.hms:location`, которая в свою очередь тянет agconnect-core старой, не поддерживающей gradle 8 версии, из-за чего не собирается билд.
if (requested.name == "agconnect-core") {
useVersion(libs.versions.agconnectCore.get())
}
}
}
dependencies {
api project(":lifecycle")

View File

@ -1,5 +1,9 @@
apply from: "../android-configs/lib-config.gradle"
android {
namespace "ru.touchin.roboswag.core.log"
}
dependencies {
implementation "androidx.annotation:annotation"

View File

@ -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 {

View File

@ -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")

View File

@ -1,5 +1,9 @@
apply from: "../android-configs/lib-config.gradle"
android {
namespace "ru.touchin.roboswag.recyclerview_adapters"
}
dependencies {
implementation project(':kotlin-extensions')

View File

@ -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'

View File

@ -1,5 +1,9 @@
apply from: "../android-configs/lib-config.gradle"
android {
namespace "ru.touchin.extensions.rx"
}
dependencies {
implementation project(":utils")
implementation project(":logging")

View File

@ -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")

View File

@ -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"

View File

@ -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
}
}