Skip to content

Commit

Permalink
Merge core-api-updates into development
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickmichalik committed Dec 3, 2023
2 parents c5fa17c + 84e0115 commit b449c14
Show file tree
Hide file tree
Showing 261 changed files with 9,253 additions and 9,846 deletions.
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ indent_size = 2
[*.{kts,kt}]
ij_kotlin_allow_trailing_comma = true
ij_kotlin_allow_trailing_comma_on_call_site = true
ktlint_function_naming_ignore_when_annotated_with = Composable
max_line_length = 120
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
name: Run Detekt
name: Run Ktlint
on:
push:
pull_request:
jobs:
run-detekt:
run-ktlint:
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: 17
distribution: zulu
- uses: gradle/gradle-build-action@v2
- run: ./gradlew detekt
- run: |
curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.1/ktlint
chmod +x ktlint
sudo mv ktlint /usr/local/bin
- uses: actions/checkout@v3
- run: ktlint
71 changes: 0 additions & 71 deletions .idea/detekt-config.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/detekt.xml

This file was deleted.

25 changes: 0 additions & 25 deletions .idea/jsonSchemas.xml

This file was deleted.

21 changes: 1 addition & 20 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
* limitations under the License.
*/

import io.gitlab.arturbosch.detekt.Detekt

buildscript {
dependencies {
classpath(libs.buildTools)
Expand All @@ -24,25 +22,8 @@ buildscript {
}
}

plugins {
alias(libs.plugins.detekt)
alias(libs.plugins.dokka) apply false
}
plugins { alias(libs.plugins.dokka) apply false }

apply("versions.gradle")

dependencies { detektPlugins(libs.detektFormatting) }

tasks.register<Delete>("clean") { delete(rootProject.layout.buildDirectory) }

tasks.register<Detekt>("detektFix") { autoCorrect = true }

tasks.withType<Detekt>().configureEach {
source = fileTree(projectDir)
config = files(".idea/detekt-config.yml")
buildUponDefaultConfig = true
reports.html {
required = true
outputLocation = file("build/reports/detekt/detekt.html")
}
}
3 changes: 0 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ appcompat = "1.6.1"
composeBom = "2023.10.01"
composeCompiler = "1.5.4"
coroutines = "1.7.3"
detekt = "1.23.3"
dokka = "1.9.10"
jUnit = "4.13.2"
jUnitExt = "1.1.5"
Expand All @@ -33,7 +32,6 @@ composeUI = { group = "androidx.compose.ui", name = "ui" }
composeUITooling = { group = "androidx.compose.ui", name = "ui-tooling" }
composeViewBinding = { group = "androidx.compose.ui", name = "ui-viewbinding" }
coroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
detektFormatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }
jUnit = { group = "junit", name = "junit", version.ref = "jUnit" }
jUnitExt = { group = "androidx.test.ext", name = "junit", version.ref = "jUnitExt" }
kotlinGradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
Expand All @@ -48,5 +46,4 @@ testCore = { group = "androidx.test", name = "core-ktx", version.ref = "testCore
viewModelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }

[plugins]
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import androidx.activity.compose.setContent
import androidx.core.view.WindowCompat

internal class MainActivity : ComponentActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
WindowCompat.setDecorFitsSystemWindows(window, false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ internal fun VicoApp() {
}
VicoTheme {
Box(
modifier = Modifier
.fillMaxSize()
.background(color = MaterialTheme.colorScheme.background),
modifier =
Modifier
.fillMaxSize()
.background(color = MaterialTheme.colorScheme.background),
) { ShowcaseScreen() }
}
}
Loading

0 comments on commit b449c14

Please sign in to comment.