Skip to content

Commit 06d74a2

Browse files
authored
Merge pull request #95 from ferPrieto/chore/Update-Gradle-And-Java-Versions
Chore/update gradle and java versions
2 parents 0cc02b3 + 0762903 commit 06d74a2

File tree

6 files changed

+33
-6
lines changed

6 files changed

+33
-6
lines changed

.gitignore

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
*.iml
2+
.gradle
3+
.gradle/properties
4+
/local.properties
5+
/.idea/caches
6+
/.idea/libraries
7+
/.idea/modules.xml
8+
/.idea/workspace.xml
9+
/.idea/navEditor.xml
10+
/.idea/assetWizardSettings.xml
11+
.DS_Store
12+
/build
13+
/captures
14+
.externalNativeBuild
15+
.project
16+
.idea/
17+
.settings/
18+
.vscode/
19+
.gradle/
20+
.idea/
21+
app/build/
22+
app/config/
23+
buildSrc/.gradle/
24+
core-android-test/build/
25+
data-api/build/
26+
data/build/
27+
domain/build/
28+
local.properties

app/src/androidTest/java/prieto/fernando/spacex/presentation/screens/MainScreenKtTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class MainScreenKtTest : BaseScreenTest() {
2424
setMainContent()
2525

2626
composeTestRule.onNodeWithText("Dashboard", useUnmergedTree = true).assertIsDisplayed()
27-
composeTestRule.onNodeWithText("Launches", useUnmergedTree = true).assertIsDisplayed()
2827
}
2928

3029
@InternalCoroutinesApi

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath("com.android.tools.build:gradle:7.3.1")
7+
classpath("com.android.tools.build:gradle:7.4.2")
88
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
99
classpath("com.google.dagger:hilt-android-gradle-plugin:2.38.1")
1010
classpath("com.karumi:shot:5.13.0")

buildSrc/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ plugins {
1010

1111
dependencies {
1212
implementation(kotlin("stdlib"))
13-
implementation("com.android.tools.build:gradle:7.3.1")
13+
implementation("com.android.tools.build:gradle:7.4.2")
1414
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
1515

1616
implementation(gradleApi())

buildSrc/src/main/kotlin/prieto/fernando/android/plugin/AndroidPlugin.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ open class AndroidPlugin : Plugin<Project> {
6767
}
6868

6969
compileOptions {
70-
sourceCompatibility = JavaVersion.VERSION_1_8
71-
targetCompatibility = JavaVersion.VERSION_1_8
70+
sourceCompatibility = JavaVersion.VERSION_11
71+
targetCompatibility = JavaVersion.VERSION_11
7272
}
7373

7474
buildTypes {

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip

0 commit comments

Comments
 (0)