Skip to content

Commit

Permalink
GH-48 Bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
dzikoysk committed Nov 25, 2022
1 parent 868779d commit 0d35483
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion pom-application/.idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pom-application/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 12 additions & 11 deletions pom-application/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ android {
}
}

compileSdk 32
compileSdk 33

defaultConfig {
applicationId "net.dzikoysk.presenceofmind"
minSdk 29
targetSdk 32
targetSdk 33
versionCode 10
versionName "1.0.0-RC.10"
archivesBaseName = "presence-of-mind-$versionName"
Expand Down Expand Up @@ -71,6 +71,7 @@ android {
includeInApk true
includeInBundle true
}
namespace 'net.dzikoysk.presenceofmind'
}

dependencies {
Expand All @@ -81,35 +82,35 @@ dependencies {
implementation("com.github.jeziellago:compose-markdown:0.2.9")
implementation("com.github.tfaki:ComposableSweetToast:1.0.1")

def appUpdate = "2.0.0"
def appUpdate = "2.0.1"
implementation("com.google.android.play:app-update-ktx:$appUpdate")

def jackson = "2.13.3"
def jackson = "2.14.0"
implementation("com.fasterxml.jackson.core:jackson-databind:$jackson")
implementation("com.fasterxml.jackson.core:jackson-core:$jackson")
implementation("com.fasterxml.jackson.core:jackson-annotations:$jackson")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jackson")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson")

def room_version = "2.4.2"
def room_version = "2.4.3"
implementation "androidx.room:room-runtime:$room_version"
annotationProcessor "androidx.room:room-compiler:$room_version"
testImplementation "androidx.room:room-testing:$room_version"

def compose_libs_version = "1.2.0-rc03"
def compose_libs_version = "1.4.0-alpha02"
implementation "androidx.compose.ui:ui:$compose_libs_version"
implementation "androidx.compose.ui:ui-util:$compose_libs_version"
implementation "androidx.compose.material:material:$compose_libs_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_libs_version"
debugImplementation "androidx.compose.ui:ui-tooling:$compose_libs_version"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_libs_version"

implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0'
implementation 'androidx.activity:activity-compose:1.5.0'
implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
implementation 'androidx.activity:activity-compose:1.6.1'
implementation 'androidx.core:core-ktx:1.9.0'

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
}
3 changes: 1 addition & 2 deletions pom-application/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.dzikoysk.presenceofmind">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
4 changes: 2 additions & 2 deletions pom-application/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buildscript {
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.2.1' apply false
id 'com.android.library' version '7.2.1' apply false
id 'com.android.application' version '7.3.1' apply false
id 'com.android.library' version '7.3.1' apply false
id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
}

Expand Down
2 changes: 1 addition & 1 deletion pom-application/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Apr 30 13:26:52 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Binary file added pom-assets/app-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pom-assets/full-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pom-assets/full-cropped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pom-assets/full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pom-assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions pom-assets/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pom-assets/text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0d35483

Please sign in to comment.