Skip to content

Commit 44d822c

Browse files
evan10sevan10s
committed
2025 tlc
1 parent 8478042 commit 44d822c

File tree

11 files changed

+118
-105
lines changed

11 files changed

+118
-105
lines changed

‎app/build.gradle.kts‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
id("com.android.application")
35
kotlin("android")
@@ -6,6 +8,7 @@ plugins {
68
id("dagger.hilt.android.plugin")
79
id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
810
id("com.google.android.gms.oss-licenses-plugin")
11+
id("org.jetbrains.kotlin.plugin.compose")
912
}
1013

1114
dependencies {
@@ -71,16 +74,22 @@ hilt {
7174
enableExperimentalClasspathAggregation = true
7275
}
7376

77+
kotlin {
78+
compilerOptions {
79+
jvmTarget = JvmTarget.JVM_21
80+
}
81+
}
82+
7483
android {
7584
signingConfigs {
7685
create("release") {
7786
}
7887
}
79-
compileSdk = 35
88+
compileSdk = 36
8089
defaultConfig {
8190
applicationId = "org.robojackets.apiary"
8291
minSdk = 21
83-
targetSdk = 35
92+
targetSdk = 36
8493
versionCode = 12
8594
versionName = "1.0.0"
8695
vectorDrawables {
@@ -103,16 +112,10 @@ android {
103112
buildConfig = true
104113
}
105114
compileOptions {
106-
sourceCompatibility = JavaVersion.VERSION_17
107-
targetCompatibility = JavaVersion.VERSION_17
115+
sourceCompatibility = JavaVersion.VERSION_21
116+
targetCompatibility = JavaVersion.VERSION_21
108117
isCoreLibraryDesugaringEnabled = true
109118
}
110-
kotlinOptions {
111-
jvmTarget = "17"
112-
}
113-
composeOptions {
114-
kotlinCompilerExtensionVersion = "1.5.1"
115-
}
116119
namespace = "org.robojackets.apiary"
117120
hilt {
118121
enableExperimentalClasspathAggregation = true

‎app/src/main/java/org/robojackets/apiary/MainActivity.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import androidx.annotation.StringRes
99
import androidx.compose.animation.EnterTransition
1010
import androidx.compose.animation.ExitTransition
1111
import androidx.compose.foundation.layout.Box
12+
import androidx.compose.foundation.layout.consumeWindowInsets
1213
import androidx.compose.foundation.layout.padding
1314
import androidx.compose.material.icons.Icons
1415
import androidx.compose.material.icons.filled.Settings
@@ -241,7 +242,9 @@ class MainActivity : ComponentActivity() {
241242
}
242243
}
243244
) { innerPadding ->
244-
Box(modifier = Modifier.padding(innerPadding)) {
245+
Box(
246+
modifier = Modifier.padding(innerPadding).consumeWindowInsets(innerPadding),
247+
) {
245248
NfcRequired(nfcEnabled = nfcEnabled) {
246249
AppNavigation(navController)
247250
}

‎attendance/build.gradle.kts‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
id("com.android.library")
35
kotlin("android")
46
id("kotlin-android")
57
id("com.google.devtools.ksp")
68
id("dagger.hilt.android.plugin")
79
id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
10+
id("org.jetbrains.kotlin.plugin.compose")
811
}
912

1013
dependencies {
@@ -45,8 +48,14 @@ dependencies {
4548
androidTestImplementation(TestDependencies.junit)
4649
}
4750

51+
kotlin {
52+
compilerOptions {
53+
jvmTarget = JvmTarget.JVM_21
54+
}
55+
}
56+
4857
android {
49-
compileSdk = 35
58+
compileSdk = 36
5059
defaultConfig {
5160
minSdk = 21
5261
vectorDrawables {
@@ -67,16 +76,10 @@ android {
6776
buildConfig = true
6877
}
6978
compileOptions {
70-
sourceCompatibility = JavaVersion.VERSION_17
71-
targetCompatibility = JavaVersion.VERSION_17
79+
sourceCompatibility = JavaVersion.VERSION_21
80+
targetCompatibility = JavaVersion.VERSION_21
7281
isCoreLibraryDesugaringEnabled = true
7382
}
74-
kotlinOptions {
75-
jvmTarget = "17"
76-
}
77-
composeOptions {
78-
kotlinCompilerExtensionVersion = "1.5.1"
79-
}
8083
namespace = "org.robojackets.apiary.attendance"
8184
hilt {
8285
enableExperimentalClasspathAggregation = true

‎auth/build.gradle.kts‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
id("com.android.library")
35
kotlin("android")
46
id("kotlin-android")
57
id("com.google.devtools.ksp")
68
id("dagger.hilt.android.plugin")
79
id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
10+
id("org.jetbrains.kotlin.plugin.compose")
811
}
912

1013
hilt {
@@ -26,7 +29,6 @@ dependencies {
2629

2730
implementation(AuthDependencies.appauth)
2831

29-
implementation(ComposeDependencies.accompanist_systemuicontroller)
3032
implementation(ComposeDependencies.compose_foundation)
3133
implementation(ComposeDependencies.compose_material3)
3234
implementation(ComposeDependencies.compose_ui)
@@ -53,8 +55,14 @@ dependencies {
5355
androidTestImplementation(TestDependencies.junit)
5456
}
5557

58+
kotlin {
59+
compilerOptions {
60+
jvmTarget = JvmTarget.JVM_21
61+
}
62+
}
63+
5664
android {
57-
compileSdk = 35
65+
compileSdk = 36
5866
defaultConfig {
5967
minSdk = 21
6068

@@ -77,16 +85,10 @@ android {
7785
buildConfig = true
7886
}
7987
compileOptions {
80-
sourceCompatibility = JavaVersion.VERSION_17
81-
targetCompatibility = JavaVersion.VERSION_17
88+
sourceCompatibility = JavaVersion.VERSION_21
89+
targetCompatibility = JavaVersion.VERSION_21
8290
isCoreLibraryDesugaringEnabled = true
8391
}
84-
kotlinOptions {
85-
jvmTarget = "17"
86-
}
87-
composeOptions {
88-
kotlinCompilerExtensionVersion = "1.5.1"
89-
}
9092
namespace = "org.robojackets.apiary.auth"
9193
hilt {
9294
enableExperimentalClasspathAggregation = true

‎auth/src/main/java/org/robojackets/apiary/auth/ui/Authentication.kt‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import androidx.compose.material3.Text
2424
import androidx.compose.material3.TextButton
2525
import androidx.compose.material3.rememberModalBottomSheetState
2626
import androidx.compose.runtime.Composable
27-
import androidx.compose.runtime.SideEffect
2827
import androidx.compose.runtime.collectAsState
2928
import androidx.compose.runtime.getValue
3029
import androidx.compose.runtime.mutableStateOf
@@ -35,7 +34,6 @@ import androidx.compose.ui.Modifier
3534
import androidx.compose.ui.res.painterResource
3635
import androidx.compose.ui.semantics.Role
3736
import androidx.compose.ui.unit.dp
38-
import com.google.accompanist.systemuicontroller.rememberSystemUiController
3937
import net.openid.appauth.AuthorizationException
4038
import net.openid.appauth.AuthorizationResponse
4139
import org.robojackets.apiary.auth.R
@@ -56,12 +54,6 @@ private fun Authentication(
5654
onAppEnvChange: (newEnv: AppEnvironment) -> Unit,
5755
viewModel: AuthenticationViewModel,
5856
) {
59-
val systemUiController = rememberSystemUiController()
60-
val backgroundColor = MaterialTheme.colorScheme.background
61-
SideEffect {
62-
systemUiController.setSystemBarsColor(backgroundColor)
63-
}
64-
6557
val launcher =
6658
rememberLauncherForActivityResult(contract = ActivityResultContracts.StartActivityForResult()) {
6759
if (it.resultCode == RESULT_OK) {
@@ -123,7 +115,8 @@ private fun Authentication(
123115
Column(
124116
modifier = Modifier
125117
.fillMaxWidth()
126-
.fillMaxHeight(),
118+
.fillMaxHeight()
119+
.padding(bottom = 8.dp),
127120
horizontalAlignment = Alignment.CenterHorizontally,
128121
verticalArrangement = Arrangement.SpaceBetween
129122
) {

‎base/build.gradle.kts‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
id("com.android.library")
35
kotlin("android")
@@ -6,6 +8,7 @@ plugins {
68
id("dagger.hilt.android.plugin")
79
id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
810
kotlin("plugin.serialization") version "2.0.0"
11+
id("org.jetbrains.kotlin.plugin.compose")
912
}
1013

1114
dependencies {
@@ -49,8 +52,14 @@ hilt {
4952
enableExperimentalClasspathAggregation = true
5053
}
5154

55+
kotlin {
56+
compilerOptions {
57+
jvmTarget = JvmTarget.JVM_21
58+
}
59+
}
60+
5261
android {
53-
compileSdk = 35
62+
compileSdk = 36
5463
defaultConfig {
5564
minSdk = 21
5665

@@ -72,16 +81,10 @@ android {
7281
buildConfig = true
7382
}
7483
compileOptions {
75-
sourceCompatibility = JavaVersion.VERSION_17
76-
targetCompatibility = JavaVersion.VERSION_17
84+
sourceCompatibility = JavaVersion.VERSION_21
85+
targetCompatibility = JavaVersion.VERSION_21
7786
isCoreLibraryDesugaringEnabled = true
7887
}
79-
kotlinOptions {
80-
jvmTarget = "17"
81-
}
82-
composeOptions {
83-
kotlinCompilerExtensionVersion = "1.5.1"
84-
}
8588
namespace = "org.robojackets.apiary.base"
8689
hilt {
8790
enableExperimentalClasspathAggregation = true

‎build.gradle.kts‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
buildscript {
24
repositories {
35
google()
46
mavenCentral()
57
gradlePluginPortal()
68
}
79
dependencies {
8-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
9-
classpath("com.android.tools.build:gradle:8.6.0")
10-
classpath("com.google.dagger:hilt-android-gradle-plugin:2.51.1") // This version needs to
10+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0")
11+
classpath("com.android.tools.build:gradle:8.11.0")
12+
classpath("com.google.dagger:hilt-android-gradle-plugin:2.56.2") // This version needs to
1113
// match the version for other Hilt dependencies defined in Dependencies.kt
1214
classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1")
13-
classpath("com.google.gms:google-services:4.4.2")
15+
classpath("com.google.gms:google-services:4.4.3")
1416
classpath("com.google.android.gms:oss-licenses-plugin:0.10.6")
1517
}
1618
}
@@ -30,17 +32,18 @@ allprojects {
3032
}
3133

3234
plugins {
33-
id("com.google.devtools.ksp").version("1.9.0-1.0.13").apply(false)
34-
id("io.gitlab.arturbosch.detekt").version("1.23.0")
35-
id("com.autonomousapps.dependency-analysis").version("1.21.0")
36-
id("com.github.ben-manes.versions").version("0.46.0")
37-
id("com.android.library") version "8.6.0-rc01" apply false
38-
id("org.jetbrains.kotlin.android") version "1.9.0" apply false
35+
id("com.google.devtools.ksp").version("2.2.0-2.0.2").apply(false)
36+
id("io.gitlab.arturbosch.detekt").version("1.23.8")
37+
id("com.autonomousapps.dependency-analysis").version("2.19.0")
38+
id("com.github.ben-manes.versions").version("0.52.0")
39+
id("com.android.library") version "8.11.0" apply false
40+
id("org.jetbrains.kotlin.android") version "2.2.0" apply false
41+
id("org.jetbrains.kotlin.plugin.compose") version "2.2.0"
3942
}
4043

4144
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
42-
kotlinOptions {
43-
jvmTarget = "17"
45+
compilerOptions {
46+
jvmTarget.set(JvmTarget.JVM_21)
4447
}
4548
}
4649

@@ -75,7 +78,7 @@ tasks.register("detektAll", io.gitlab.arturbosch.detekt.Detekt::class) {
7578
}
7679

7780
dependencies {
78-
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.0")
81+
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.8")
7982
}
8083

8184
// from https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin/wiki/ABI-filtering

0 commit comments

Comments
 (0)