Issue#35 version updates
This commit is contained in:
parent
1a78899677
commit
a5dcdd3409
14 changed files with 48 additions and 44 deletions
|
|
@ -4,11 +4,11 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
minSdk rootProject.ext.minSdkVersion
|
||||
targetSdk rootProject.ext.targetSdkVersion
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
consumerProguardFiles "consumer-rules.pro"
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
defaultConfig {
|
||||
applicationId "org.fnives.test.showcase"
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
minSdk rootProject.ext.minSdkVersion
|
||||
targetSdk rootProject.ext.targetSdkVersion
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
buildConfigField "String", "BASE_URL", '"https://606844a10add49001733fe6b.mockapi.io/"'
|
||||
|
|
@ -37,7 +37,7 @@ android {
|
|||
compose = true
|
||||
}
|
||||
composeOptions {
|
||||
kotlinCompilerExtensionVersion = project.androidx_compose_version
|
||||
kotlinCompilerExtensionVersion = project.compose_compiler_version
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
|
|
|||
14
build.gradle
14
build.gradle
|
|
@ -1,20 +1,24 @@
|
|||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
buildscript {
|
||||
ext.kotlin_version = "1.6.10"
|
||||
ext.kotlin_version = "1.7.10"
|
||||
ext.detekt_version = "1.19.0"
|
||||
ext.navigation_version = "2.4.2"
|
||||
ext.hilt_version = "2.40.5"
|
||||
ext.hilt_version = "2.44"
|
||||
ext.compose_compiler_version = "1.3.1"
|
||||
ext.compileSdkVersion = 32
|
||||
ext.minSdkVersion = 21
|
||||
ext.targetSdkVersion = 32
|
||||
repositories {
|
||||
mavenCentral()
|
||||
google()
|
||||
maven { url "https://plugins.gradle.org/m2/" }
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:7.1.3'
|
||||
classpath 'com.android.tools.build:gradle:7.3.0'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
classpath "org.jlleitschuh.gradle:ktlint-gradle:10.2.1"
|
||||
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
|
||||
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
|
||||
classpath "org.jlleitschuh.gradle:ktlint-gradle:10.2.1"
|
||||
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detekt_version"
|
||||
}
|
||||
}
|
||||
|
|
@ -45,4 +49,4 @@ apply from: 'gradlescripts/lint.gradle'
|
|||
apply from: 'gradlescripts/testoptions.gradle'
|
||||
apply from: 'gradlescripts/test.tasks.gradle'
|
||||
apply from: 'gradlescripts/testdependencies.gradle'
|
||||
apply from: 'gradlescripts/disable.test.task.gradle'
|
||||
apply from: 'gradlescripts/disable.test.task.gradle'
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
minSdk rootProject.ext.minSdkVersion
|
||||
targetSdk rootProject.ext.targetSdkVersion
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
consumerProguardFiles "consumer-rules.pro"
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
minSdk rootProject.ext.minSdkVersion
|
||||
targetSdk rootProject.ext.targetSdkVersion
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
consumerProguardFiles "consumer-rules.pro"
|
||||
|
|
|
|||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#Thu Jan 27 21:44:07 EET 2022
|
||||
#Fri Sep 30 19:34:26 EEST 2022
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ project.ext {
|
|||
androidx_swiperefreshlayout_version = "1.1.0"
|
||||
room_version = "2.4.3"
|
||||
activity_ktx_version = "1.4.0"
|
||||
androidx_navigation = "2.4.0"
|
||||
androidx_navigation = "2.5.1"
|
||||
|
||||
androidx_compose_version = "1.1.0"
|
||||
androidx_compose_version = "1.2.1"
|
||||
google_accompanist_version = "0.23.1"
|
||||
androidx_compose_constraintlayout_version = "1.0.0"
|
||||
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
minSdk rootProject.ext.minSdkVersion
|
||||
targetSdk rootProject.ext.targetSdkVersion
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
consumerProguardFiles "consumer-rules.pro"
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
defaultConfig {
|
||||
applicationId "org.fnives.test.showcase.hilt"
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
minSdk rootProject.ext.minSdkVersion
|
||||
targetSdk rootProject.ext.targetSdkVersion
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
buildConfigField "String", "BASE_URL", '"https://606844a10add49001733fe6b.mockapi.io/"'
|
||||
|
|
@ -38,7 +38,7 @@ android {
|
|||
compose = true
|
||||
}
|
||||
composeOptions {
|
||||
kotlinCompilerExtensionVersion = project.androidx_compose_version
|
||||
kotlinCompilerExtensionVersion = project.compose_compiler_version
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
minSdk rootProject.ext.minSdkVersion
|
||||
targetSdk rootProject.ext.targetSdkVersion
|
||||
|
||||
consumerProguardFiles "consumer-rules.pro"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
minSdk rootProject.ext.minSdkVersion
|
||||
targetSdk rootProject.ext.targetSdkVersion
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
consumerProguardFiles "consumer-rules.pro"
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
minSdk rootProject.ext.minSdkVersion
|
||||
targetSdk rootProject.ext.targetSdkVersion
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
consumerProguardFiles "consumer-rules.pro"
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
minSdk rootProject.ext.minSdkVersion
|
||||
targetSdk rootProject.ext.targetSdkVersion
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
consumerProguardFiles "consumer-rules.pro"
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
compileSdk 31
|
||||
compileSdk rootProject.ext.compileSdkVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdk 21
|
||||
targetSdk 31
|
||||
minSdk rootProject.ext.minSdkVersion
|
||||
targetSdk rootProject.ext.targetSdkVersion
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
consumerProguardFiles "consumer-rules.pro"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue