Skip to content

Commit

Permalink
Merge pull request #184 from teogor/chore/update-dependencies
Browse files Browse the repository at this point in the history
Update Project Dependencies to Latest Versions
  • Loading branch information
teogor authored Mar 4, 2024
2 parents a734a15 + f63620c commit 0addedd
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 39 deletions.
2 changes: 2 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<!-- TODO move to :notifications:*-->
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />

Expand Down
5 changes: 2 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,10 @@ subprojects {
target("**/*.kt")
targetExclude("**/build/**/*.kt")
ktlint(ktlintVersion)
.userData(
.editorConfigOverride(
mapOf(
"android" to "true",
"ktlint_code_style" to "android",
"ktlint_code_style" to "intellij_idea",
"ij_kotlin_allow_trailing_comma" to "true",
// These rules were introduced in ktlint 0.46.0 and should not be
// enabled without further discussion. They are disabled for now.
Expand Down Expand Up @@ -260,7 +260,6 @@ subprojects {
}
}


tasks.dokkaHtmlMultiModule {
dependsOn(":backup:dokkaHtmlMultiModule")
dependsOn(":core:dokkaHtmlMultiModule")
Expand Down
73 changes: 38 additions & 35 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,80 +2,82 @@
aboutLibraries = "10.8.3"
accompanist = "0.33.2-alpha"
androidDesugarJdkLibs = "2.0.4"
android-gradle-plugin = "8.1.4"
androidxActivity = "1.8.1"
androidxAnnotation = "1.7.0"
android-gradle-plugin = "8.2.2"
androidxActivity = "1.8.2"
androidxAnnotation = "1.7.1"
androidxAppCompat = "1.6.1"
androidxBrowser = "1.7.0"
androidxComposeBom = "2023.10.01"
androidxComposeCompiler = "1.5.4"
androidxComposeMaterial3 = "1.2.0-alpha11"
androidxComposeRuntimeTracing = "1.0.0-alpha05"
androidxComposeBom = "2024.02.01"
androidxComposeCompiler = "1.5.8"
androidxComposeMaterial3 = "1.2.0"
androidxComposeRuntimeTracing = "1.0.0-beta01"
androidxConstraint = "1.1.0-alpha13"
androidxCore = "1.12.0"
androidxCoreSplashscreen = "1.0.1"
androidxDataStore = "1.0.0"
androidxEspresso = "3.5.1"
androidxHiltNavigationCompose = "1.1.0"
androidxLifecycle = "2.6.2"
androidxMacroBenchmark = "1.2.1"
androidxMetrics = "1.0.0-alpha04"
androidxNavigation = "2.7.5"
androidxHiltNavigationCompose = "1.2.0"
androidxLifecycle = "2.7.0"
androidxMacroBenchmark = "1.2.3"
androidxMetrics = "1.0.0-beta01"
androidxNavigation = "2.7.7"
androidxProfileinstaller = "1.3.1"
androidxStartup = "1.1.1"
androidxTestCore = "1.5.0"
androidxTestExt = "1.1.5"
androidxTestRules = "1.5.0"
androidxTestRunner = "1.5.3"
androidxTracing = "1.1.0"
androidxUiAutomator = "2.2.0"
androidxTracing = "1.2.0"
androidxUiAutomator = "2.3.0"
androidxWindowManager = "1.2.0"
androidxWork = "2.8.1"
apiValidator = "0.13.2"
androidxWork = "2.9.0"
apiValidator = "0.14.0"
buildConfig = "3.1.0"
coil = "2.4.0"
coil = "2.5.0"
colorMath = "3.2.0"
dokka = "1.9.0"
dokka = "1.9.10"
espressoCore = "3.5.1"
firebaseBom = "32.6.0"
firebaseBom = "32.7.3"
firebaseCrashlyticsPlugin = "2.9.9"
firebasePerfPlugin = "1.4.2"
gmsPlugin = "4.4.0"
googleMaterial = "1.10.0"
gmsPlugin = "4.4.1"
googleMaterial = "1.11.0"
gradlePublish = "1.1.0"
gson = "2.10.1"
hilt = "2.48.1"
hiltExt = "1.1.0"
hilt = "2.50"
hiltExt = "1.2.0"
jacoco = "0.8.7"
jdom2 = "2.0.6.1"
jsoup = "1.16.1"
junit = "4.13.2"
junit4 = "4.13.2"
kotlin = "1.9.20"
kotlin = "1.9.22"
kotlin-poet = "1.14.2"
kotlin-xml-builder = "1.9.1"
kotlinx-serialization-core = "1.6.0"
kotlinx-serialization-core = "1.6.2"
kotlinxCollections = "0.3.6"
kotlinxCoroutines = "1.7.3"
kotlinxDatetime = "0.4.1"
kotlinxSerializationJson = "1.6.0"
ksp = "1.9.20-1.0.13"
landscapist = "2.2.3"
lifecycleRuntimeKtx = "2.6.2"
lint = "31.1.4"
kotlinxDatetime = "0.5.0"
kotlinxSerializationJson = "1.6.2"
ksp = "1.9.22-1.0.17"
landscapist = "2.3.1"
lifecycleRuntimeKtx = "2.7.0"
lint = "31.2.2"
okhttp = "4.12.0"
protobuf = "3.24.4"
protobufPlugin = "0.9.4"
querent = "1.0.0-alpha01"
querent = "1.0.0-alpha02"
retrofit = "2.9.0"
retrofitKotlinxSerializationJson = "1.0.0"
room = "2.6.0"
spotless = "6.21.0"
room = "2.6.1"
spotless = "6.25.0"
startup = "1.2.0-alpha02"
turbine = "1.0.0"
vanniktechMavenPlugin = "0.25.3"
vanniktechMavenPlugin = "0.27.0"
winds = "1.0.0-alpha04"
xenoglot-bom = "1.0.0-alpha01"
teogor-gleam = "1.0.0-alpha01"
google-android-ump = "2.2.0"

[libraries]
about-libraries-core = { group = "com.mikepenz", name = "aboutlibraries-core", version.ref = "aboutLibraries" }
Expand Down Expand Up @@ -144,6 +146,7 @@ firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashly
firebase-performance-gradle = { group = "com.google.firebase", name = "perf-plugin", version.ref = "firebasePerfPlugin" }
firebase-performance = { group = "com.google.firebase", name = "firebase-perf" }
google-material = { group = "com.google.android.material", name = "material", version.ref = "googleMaterial" }
google-android-ump = { module = "com.google.android.ump:user-messaging-platform", version.ref = "google-android-ump" }
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" }
hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
Expand Down
2 changes: 1 addition & 1 deletion monetisation/messaging/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ android {
}

dependencies {
api("com.google.android.ump:user-messaging-platform:2.1.0")
api(libs.google.android.ump)

api(project(":core:register"))
api(project(":core:runtime"))
Expand Down
16 changes: 16 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2023 teogor (Teodor Grigor)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

pluginManagement {
includeBuild("plugin/")
repositories {
Expand Down
1 change: 1 addition & 0 deletions ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import dev.teogor.winds.api.model.createVersion

plugins {
Expand Down

0 comments on commit 0addedd

Please sign in to comment.