Skip to content

Commit f4aa061

Browse files
tientien
authored
style: use official Kotlin style guide (#246)
1 parent 36426b2 commit f4aa061

62 files changed

Lines changed: 3832 additions & 3691 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/development.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v4
15-
- uses: actions/setup-java@v4
15+
- uses: actions/setup-java@v5
1616
with:
1717
distribution: temurin
18-
java-version: 17
18+
java-version: 25
1919
cache: gradle
2020

2121
- uses: ruby/setup-ruby@v1
@@ -31,10 +31,10 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v4
3333

34-
- uses: actions/setup-java@v4
34+
- uses: actions/setup-java@v5
3535
with:
3636
distribution: temurin
37-
java-version: 17
37+
java-version: 25
3838
cache: gradle
3939

4040
- uses: ruby/setup-ruby@v1

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616

17-
- uses: actions/setup-java@v4
17+
- uses: actions/setup-java@v5
1818
with:
1919
distribution: temurin
20-
java-version: 17
20+
java-version: 25
2121
cache: gradle
2222

2323
- uses: ruby/setup-ruby@v1

‎.sdkmanrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
java=25.0.2-tem

‎app/build.gradle.kts‎

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -4,114 +4,114 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
44
val openApiOutput = file("${layout.buildDirectory.asFile.get().path}/generated/source/open-api")
55

66
plugins {
7-
alias(libs.plugins.android.application)
8-
alias(libs.plugins.compose)
9-
alias(libs.plugins.hilt)
10-
alias(libs.plugins.kotlin.android)
11-
alias(libs.plugins.kotlin.serialization)
12-
alias(libs.plugins.ksp)
13-
alias(libs.plugins.openapi.generator)
14-
alias(libs.plugins.protobuf)
15-
idea
7+
alias(libs.plugins.android.application)
8+
alias(libs.plugins.compose)
9+
alias(libs.plugins.hilt)
10+
alias(libs.plugins.kotlin.android)
11+
alias(libs.plugins.kotlin.serialization)
12+
alias(libs.plugins.ksp)
13+
alias(libs.plugins.openapi.generator)
14+
alias(libs.plugins.protobuf)
15+
idea
1616
}
1717

1818
android {
19-
namespace = "com.tien.piholeconnect"
20-
21-
compileSdk = 36
22-
23-
defaultConfig {
24-
applicationId = "com.tien.piholeconnect"
25-
minSdk = 23
26-
targetSdk = 36
27-
versionCode = 1
28-
versionName = "SNAPSHOT"
29-
30-
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
31-
vectorDrawables { useSupportLibrary = true }
32-
}
33-
34-
androidResources { localeFilters += listOf("en", "de", "pl", "ro") }
35-
36-
buildTypes {
37-
release {
38-
isMinifyEnabled = true
39-
isShrinkResources = true
40-
proguardFiles(
41-
getDefaultProguardFile("proguard-android-optimize.txt"),
42-
"proguard-rules.pro",
43-
)
44-
ndk { debugSymbolLevel = "FULL" }
19+
namespace = "com.tien.piholeconnect"
20+
21+
compileSdk = 36
22+
23+
defaultConfig {
24+
applicationId = "com.tien.piholeconnect"
25+
minSdk = 23
26+
targetSdk = 36
27+
versionCode = 1
28+
versionName = "SNAPSHOT"
29+
30+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
31+
vectorDrawables { useSupportLibrary = true }
4532
}
46-
}
4733

48-
compileOptions {
49-
sourceCompatibility = JavaVersion.VERSION_17
50-
targetCompatibility = JavaVersion.VERSION_17
51-
}
34+
androidResources { localeFilters += listOf("en", "de", "pl", "ro") }
35+
36+
buildTypes {
37+
release {
38+
isMinifyEnabled = true
39+
isShrinkResources = true
40+
proguardFiles(
41+
getDefaultProguardFile("proguard-android-optimize.txt"),
42+
"proguard-rules.pro",
43+
)
44+
ndk { debugSymbolLevel = "FULL" }
45+
}
46+
}
47+
48+
compileOptions {
49+
sourceCompatibility = JavaVersion.VERSION_17
50+
targetCompatibility = JavaVersion.VERSION_17
51+
}
5252

53-
kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_17 } }
53+
kotlin { compilerOptions { jvmTarget = JvmTarget.JVM_17 } }
5454

55-
buildFeatures { compose = true }
55+
buildFeatures { compose = true }
5656

57-
packaging { resources { excludes.add("/META-INF/{AL2.0,LGPL2.1}") } }
57+
packaging { resources { excludes.add("/META-INF/{AL2.0,LGPL2.1}") } }
5858

59-
sourceSets.getByName("main") { kotlin { srcDir(File(openApiOutput, "debug/kotlin")) } }
59+
sourceSets.getByName("main") { kotlin { srcDir(File(openApiOutput, "debug/kotlin")) } }
6060

61-
tasks { preBuild { dependsOn(openApiGenerate) } }
61+
tasks { preBuild { dependsOn(openApiGenerate) } }
6262
}
6363

6464
protobuf {
65-
protoc { artifact = "com.google.protobuf:protoc:${libs.versions.protoBufJavaLite.get()}" }
65+
protoc { artifact = "com.google.protobuf:protoc:${libs.versions.protoBufJavaLite.get()}" }
6666

67-
generateProtoTasks { all().forEach { task -> task.builtins { id("java") { option("lite") } } } }
67+
generateProtoTasks { all().forEach { task -> task.builtins { id("java") { option("lite") } } } }
6868
}
6969

7070
openApiGenerate {
71-
generatorName = "kotlin"
72-
remoteInputSpec =
73-
"https://raw.githubusercontent.com/tien/FTL/refs/heads/fix/batch-delete-request-body/src/api/docs/content/specs/main.yaml"
74-
outputDir = openApiOutput.absolutePath
75-
ignoreFileOverride = "${projectDir.path}/openapi-generator-ignore"
76-
library = "multiplatform"
77-
packageName = "${android.namespace}.repository"
78-
additionalProperties =
79-
mapOf(
80-
"sourceFolder" to "debug/kotlin",
81-
"enumPropertyNaming" to "UPPERCASE",
82-
"dateLibrary" to "kotlinx-datetime",
83-
"useSettingsGradle" to true,
84-
)
85-
typeMappings =
86-
mapOf(
87-
"AddressMaybeArrayAddress" to "List<String>",
88-
"DomainMaybeArrayDomain" to "List<String>",
89-
)
71+
generatorName = "kotlin"
72+
remoteInputSpec =
73+
"https://raw.githubusercontent.com/tien/FTL/refs/heads/fix/batch-delete-request-body/src/api/docs/content/specs/main.yaml"
74+
outputDir = openApiOutput.absolutePath
75+
ignoreFileOverride = "${projectDir.path}/openapi-generator-ignore"
76+
library = "multiplatform"
77+
packageName = "${android.namespace}.repository"
78+
additionalProperties =
79+
mapOf(
80+
"sourceFolder" to "debug/kotlin",
81+
"enumPropertyNaming" to "UPPERCASE",
82+
"dateLibrary" to "kotlinx-datetime",
83+
"useSettingsGradle" to true,
84+
)
85+
typeMappings =
86+
mapOf(
87+
"AddressMaybeArrayAddress" to "List<String>",
88+
"DomainMaybeArrayDomain" to "List<String>",
89+
)
9090
}
9191

9292
dependencies {
93-
val composeBom = platform(libs.androidx.compose.bom)
94-
implementation(composeBom)
95-
androidTestImplementation(composeBom)
96-
97-
implementation(libs.android.billingclient.ktx)
98-
implementation(libs.androidx.activity.compose)
99-
implementation(libs.androidx.core.ktx)
100-
implementation(libs.androidx.datastore)
101-
implementation(libs.androidx.hilt.navigation.compose)
102-
implementation(libs.androidx.navigation.compose)
103-
implementation(libs.bundles.compose)
104-
implementation(libs.bundles.kotlin)
105-
implementation(libs.bundles.ktor)
106-
implementation(libs.bundles.lifecycle)
107-
implementation(libs.bundles.vico)
108-
implementation(libs.google.android.material)
109-
implementation(libs.google.dagger.hilt)
110-
implementation(libs.google.protobuf.javalite)
111-
112-
ksp(libs.google.dagger.hilt.compiler)
113-
114-
testImplementation(libs.junit.junit)
115-
androidTestImplementation(libs.bundles.androidTest)
116-
debugImplementation(libs.androidx.compose.ui.test.manifest)
93+
val composeBom = platform(libs.androidx.compose.bom)
94+
implementation(composeBom)
95+
androidTestImplementation(composeBom)
96+
97+
implementation(libs.android.billingclient.ktx)
98+
implementation(libs.androidx.activity.compose)
99+
implementation(libs.androidx.core.ktx)
100+
implementation(libs.androidx.datastore)
101+
implementation(libs.androidx.hilt.navigation.compose)
102+
implementation(libs.androidx.navigation.compose)
103+
implementation(libs.bundles.compose)
104+
implementation(libs.bundles.kotlin)
105+
implementation(libs.bundles.ktor)
106+
implementation(libs.bundles.lifecycle)
107+
implementation(libs.bundles.vico)
108+
implementation(libs.google.android.material)
109+
implementation(libs.google.dagger.hilt)
110+
implementation(libs.google.protobuf.javalite)
111+
112+
ksp(libs.google.dagger.hilt.compiler)
113+
114+
testImplementation(libs.junit.junit)
115+
androidTestImplementation(libs.bundles.androidTest)
116+
debugImplementation(libs.androidx.compose.ui.test.manifest)
117117
}

‎app/src/androidTest/java/com/tien/piholeconnect/ExampleInstrumentedTest.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import org.junit.runner.RunWith
1313
*/
1414
@RunWith(AndroidJUnit4::class)
1515
class ExampleInstrumentedTest {
16-
@Test
17-
fun useAppContext() {
18-
// Context of the app under test.
19-
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
20-
assertEquals("com.tien.piholeconnect", appContext.packageName)
21-
}
16+
@Test
17+
fun useAppContext() {
18+
// Context of the app under test.
19+
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
20+
assertEquals("com.tien.piholeconnect", appContext.packageName)
21+
}
2222
}

0 commit comments

Comments
 (0)