Skip to content

Commit

Permalink
Merge pull request #15 from droidconKE/dev
Browse files Browse the repository at this point in the history
prevent crashing because of unremoved properties
  • Loading branch information
tamzi authored Mar 26, 2023
2 parents 62b7693 + 0fff267 commit c053ba4
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 30 deletions.
42 changes: 21 additions & 21 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base",
"group:all",
":dependencyDashboard",
"schedule:daily"
],
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base",
"group:all",
":dependencyDashboard",
"schedule:daily"
],
"baseBranches": [
"depUpdates"
"dev"
],
"commitMessageExtra": "{{{currentValue}}} to {{#if isPinDigest}}{{{newDigestShort}}}{{else}}{{#if isMajor}}{{prettyNewMajor}}{{else}}{{#if isSingleVersion}}{{prettyNewVersion}}{{else}}{{#if newValue}}{{{newValue}}}{{else}}{{{newDigestShort}}}{{/if}}{{/if}}{{/if}}{{/if}}",
"packageRules": [
{
"matchPackagePatterns": [
"androidx.compose.compiler:compiler"
],
"groupName": "kotlin"
},
{
"matchPackagePatterns": [
"org.jetbrains.kotlin.*"
],
"groupName": "kotlin"
},
{
"matchPackagePatterns": [
"androidx.compose.compiler:compiler"
],
"groupName": "kotlin"
},
{
"matchPackagePatterns": [
"org.jetbrains.kotlin.*"
],
"groupName": "kotlin"
},
{
"matchPackagePatterns": [
"com.google.devtools.ksp"
],
"groupName": "kotlin"
}
]
]
}
16 changes: 8 additions & 8 deletions chaidemo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@ android {

dependencies {
implementation("androidx.core:core-ktx:1.9.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.0")
implementation("androidx.activity:activity-compose:1.6.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
implementation("androidx.activity:activity-compose:1.7.0")

implementation("androidx.compose.ui:ui:1.3.3")
implementation("androidx.compose.ui:ui-tooling-preview:1.3.3")
implementation("androidx.compose.material:material:1.3.1")
debugImplementation("androidx.compose.ui:ui-tooling:1.3.3")
debugImplementation("androidx.compose.ui:ui-test-manifest:1.3.3")
implementation("androidx.compose.ui:ui:1.4.0")
implementation("androidx.compose.ui:ui-tooling-preview:1.4.0")
implementation("androidx.compose.material:material:1.4.0")
debugImplementation("androidx.compose.ui:ui-tooling:1.4.0")
debugImplementation("androidx.compose.ui:ui-test-manifest:1.4.0")

testImplementation("junit:junit:4.13.2")

androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.3.3")
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.4.0")
}
1 change: 0 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ dependencyResolutionManagement {
}
rootProject.name = ("chai")
include(":chai")
include(":chaitime")
include(":chaidemo")
include(":chailinter")

0 comments on commit c053ba4

Please sign in to comment.