Skip to content

Commit

Permalink
GH-56 Update dependencies (Resolve #55)
Browse files Browse the repository at this point in the history
* - Updated compileSdk and targetSdk from 33 to 34
- Updated appUpdate from 2.0.1 to 2.1.0
- Updated room_version from 2.5.1 to 2.5.2
- Added compose BOM

* - Updated compose_version from 1.3.1 to 1.5.3
- Upgraded gradle from 8.0.1 to 8.1.2

* - Updated compose_version from 1.3.1 to 1.5.3
- Upgraded gradle from 8.0.1 to 8.1.2
  • Loading branch information
MJJacobs01 authored Oct 21, 2023
1 parent b546ead commit dfdd2f0
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 41 deletions.
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.

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

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

68 changes: 34 additions & 34 deletions pom-application/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id "com.android.application"
id "org.jetbrains.kotlin.android"
}

android {
Expand All @@ -12,20 +12,20 @@ android {

signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile file(keystoreProperties['storeFile'])
storePassword keystoreProperties['storePassword']
keyAlias keystoreProperties["keyAlias"]
keyPassword keystoreProperties["keyPassword"]
storeFile file(keystoreProperties["storeFile"])
storePassword keystoreProperties["storePassword"]
}
}
}

compileSdk 33
compileSdk 34

defaultConfig {
applicationId "net.dzikoysk.presenceofmind"
minSdk 29
targetSdk 33
targetSdk 34
versionCode 12
versionName "1.0.0-RC.12"
archivesBaseName = "presence-of-mind-$versionName"
Expand All @@ -43,17 +43,17 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = "1.8"
freeCompilerArgs += [
'-opt-in=kotlin.RequiresOptIn',
"-opt-in=kotlin.RequiresOptIn",
]
}
buildFeatures {
Expand All @@ -64,57 +64,57 @@ android {
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
excludes += "/META-INF/{AL2.0,LGPL2.1}"
}
}
dependenciesInfo {
includeInApk true
includeInBundle true
}
namespace 'net.dzikoysk.presenceofmind'
namespace "net.dzikoysk.presenceofmind"
}

dependencies {
implementation('org.burnoutcrew.composereorderable:reorderable:0.9.6')
implementation("org.burnoutcrew.composereorderable:reorderable:0.9.6")
implementation("io.github.androidpoet:dropdown:1.0.1")
implementation('io.github.vanpra.compose-material-dialogs:core:0.9.0')
implementation("io.github.vanpra.compose-material-dialogs:core:0.9.0")
implementation("com.github.jeziellago:compose-markdown:0.2.9")
implementation("com.github.tfaki:ComposableSweetToast:1.0.1")

def landscapist_version = '2.1.12'
def landscapist_version = "2.1.12"
implementation("com.github.skydoves:landscapist-glide:$landscapist_version")
implementation("com.github.skydoves:landscapist-placeholder:$landscapist_version")
implementation("com.github.skydoves:landscapist-animation:$landscapist_version")

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

def jackson = '2.14.2'
def jackson = "2.14.2"
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.5.1'
def room_version = "2.5.2"
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.5.0-alpha03'
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.6.1'
implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.core:core-ktx:1.10.0'

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
implementation(platform("androidx.compose:compose-bom:2023.10.01"))
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-util"
implementation "androidx.compose.material:material"
implementation "androidx.compose.ui:ui-tooling-preview"
debugImplementation "androidx.compose.ui:ui-tooling"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.5.4"

implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
implementation "androidx.activity:activity-compose:1.8.0"
implementation "androidx.core:core-ktx:1.12.0"

testImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test.ext:junit:1.1.5"
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
}
10 changes: 5 additions & 5 deletions pom-application/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
buildscript {
ext {
compose_version = '1.3.1'
compose_version = "1.5.3"
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.0.1' apply false
id 'com.android.library' version '8.0.1' apply false
id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
id "com.android.application" version "8.1.2" apply false
id "com.android.library" version "8.1.2" apply false
id "org.jetbrains.kotlin.android" version "1.9.10" apply false
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}

0 comments on commit dfdd2f0

Please sign in to comment.