Skip to content

Commit cf1e08e

Browse files
committed
Update build environment
* targetCompatibility: JVM 11 * JavaLanguageVersion: 17 * Gradle: 8.7.1 Update ignored and included Android Studio/IntelliJ files * Add .idea/deploymentTargetSelector as git file * Set .idea/runConfigurations.xml as ignored file
1 parent 8672cb6 commit cf1e08e

File tree

8 files changed

+27
-6
lines changed

8 files changed

+27
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/.idea/workspace.xml
88
/.idea/navEditor.xml
99
/.idea/assetWizardSettings.xml
10+
/.idea/runConfigurations.xml
1011
.DS_Store
1112
/build
1213
/captures

.idea/deploymentTargetSelector.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ android {
2929
}
3030
}
3131
compileOptions {
32-
sourceCompatibility = JavaVersion.VERSION_1_8
33-
targetCompatibility = JavaVersion.VERSION_1_8
32+
sourceCompatibility = JavaVersion.VERSION_11
33+
targetCompatibility = JavaVersion.VERSION_11
3434
}
3535
kotlinOptions {
36-
jvmTarget = "1.8"
36+
jvmTarget = "11"
3737
}
3838
buildFeatures {
3939
viewBinding = true
@@ -87,3 +87,8 @@ dependencies {
8787
// netmonster
8888
implementation(libs.netmonster.core)
8989
}
90+
java {
91+
toolchain {
92+
languageVersion = JavaLanguageVersion.of(17)
93+
}
94+
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = "8.3.2"
2+
agp = "8.7.1"
33
kotlin = "1.9.22"
44
coreKtx = "1.10.1"
55
activityCompose = "1.8.2"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Apr 04 23:44:22 CEST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

settings.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ pluginManagement {
1111
gradlePluginPortal()
1212
}
1313
}
14+
plugins {
15+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
16+
}
1417
dependencyResolutionManagement {
1518
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1619
repositories {

0 commit comments

Comments
 (0)