tutorials/Android-Tutorial-Test-ShowCase
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue#35 version updates

Browse source
This commit is contained in:
Gergely Hegedus 2022-09-30 21:17:41 +03:00
parent 1a78899677
commit a5dcdd3409
14 changed files with 48 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app-shared-test/build.gradle
View file

@ -4,11 +4,11 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 31 targetSdk rootProject.ext.targetSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"

8
app/build.gradle
View file

@ -5,12 +5,12 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
applicationId "org.fnives.test.showcase" applicationId "org.fnives.test.showcase"
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 31 targetSdk rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
buildConfigField "String", "BASE_URL", '"https://606844a10add49001733fe6b.mockapi.io/"' buildConfigField "String", "BASE_URL", '"https://606844a10add49001733fe6b.mockapi.io/"'
@ -37,7 +37,7 @@ android {
compose = true compose = true
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion = project.androidx_compose_version kotlinCompilerExtensionVersion = project.compose_compiler_version
} }
sourceSets { sourceSets {

14
build.gradle
View file

@ -1,20 +1,24 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = "1.6.10" ext.kotlin_version = "1.7.10"
ext.detekt_version = "1.19.0" ext.detekt_version = "1.19.0"
ext.navigation_version = "2.4.2" 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 { repositories {
mavenCentral() mavenCentral()
google() google()
maven { url "https://plugins.gradle.org/m2/" } maven { url "https://plugins.gradle.org/m2/" }
} }
dependencies { 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.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 "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_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" 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/testoptions.gradle'
apply from: 'gradlescripts/test.tasks.gradle' apply from: 'gradlescripts/test.tasks.gradle'
apply from: 'gradlescripts/testdependencies.gradle' apply from: 'gradlescripts/testdependencies.gradle'
apply from: 'gradlescripts/disable.test.task.gradle' apply from: 'gradlescripts/disable.test.task.gradle'

6
examplecase/example-navcontroller-shared-test/build.gradle
View file

@ -5,11 +5,11 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 31 targetSdk rootProject.ext.targetSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"

6
examplecase/example-navcontroller/build.gradle
View file

@ -5,11 +5,11 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 31 targetSdk rootProject.ext.targetSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Thu Jan 27 21:44:07 EET 2022 #Fri Sep 30 19:34:26 EEST 2022
distributionBase=GRADLE_USER_HOME 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 distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

4
gradlescripts/versions.gradle
View file

@ -7,9 +7,9 @@ project.ext {
androidx_swiperefreshlayout_version = "1.1.0" androidx_swiperefreshlayout_version = "1.1.0"
room_version = "2.4.3" room_version = "2.4.3"
activity_ktx_version = "1.4.0" 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" google_accompanist_version = "0.23.1"
androidx_compose_constraintlayout_version = "1.0.0" androidx_compose_constraintlayout_version = "1.0.0"

6
hilt/hilt-app-shared-test/build.gradle
View file

@ -4,11 +4,11 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 31 targetSdk rootProject.ext.targetSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"

8
hilt/hilt-app/build.gradle
View file

@ -6,12 +6,12 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
applicationId "org.fnives.test.showcase.hilt" applicationId "org.fnives.test.showcase.hilt"
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 31 targetSdk rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
buildConfigField "String", "BASE_URL", '"https://606844a10add49001733fe6b.mockapi.io/"' buildConfigField "String", "BASE_URL", '"https://606844a10add49001733fe6b.mockapi.io/"'
@ -38,7 +38,7 @@ android {
compose = true compose = true
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion = project.androidx_compose_version kotlinCompilerExtensionVersion = project.compose_compiler_version
} }
sourceSets { sourceSets {

6
hilt/hilt-network-di-test-util/build.gradle
View file

@ -4,11 +4,11 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 31 targetSdk rootProject.ext.targetSdkVersion
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
} }

6
test-util-android/build.gradle
View file

@ -4,11 +4,11 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 31 targetSdk rootProject.ext.targetSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"

6
test-util-junit5-android/build.gradle
View file

@ -4,11 +4,11 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 31 targetSdk rootProject.ext.targetSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"

6
test-util-shared-android/build.gradle
View file

@ -4,11 +4,11 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 31 targetSdk rootProject.ext.targetSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"

6
test-util-shared-robolectric/build.gradle
View file

@ -4,11 +4,11 @@ plugins {
} }
android { android {
compileSdk 31 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 31 targetSdk rootProject.ext.targetSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"