Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Frixuu committed Oct 3, 2023
1 parent 22b42fe commit 8247f56
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 26 deletions.
44 changes: 26 additions & 18 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@ plugins {
}

android {
compileSdk = 31
buildToolsVersion = "31.0.0"

namespace = "xyz.lukasz.xword"
compileSdk = 34
buildToolsVersion = "34.0.0"

androidResources {
// Compressed resources cannot be mmapped
noCompress("txt")
// Compressed resources cannot be mmapped.
// We leave dictionary files uncompressed to speed up their loading
noCompress.add("txt")
}

buildFeatures {
Expand All @@ -21,16 +24,16 @@ android {

defaultConfig {
applicationId = "xyz.lukasz.xword"
minSdk = 21
targetSdk = 31
minSdk = 23
targetSdk = 34
versionCode = 3
versionName = "1.2"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

externalNativeBuild {
cmake {
cppFlags("-std=c++20 -Wall -Wextra -pedantic")
cppFlags("-std=c++20 -Wall -Wextra -pedantic -frtti -fno-exceptions")
}
}

Expand All @@ -55,7 +58,7 @@ android {
targetCompatibility = JavaVersion.VERSION_1_8
}

ndkVersion = "24.0.8215888"
ndkVersion = "26.0.10792818"
externalNativeBuild {
cmake {
path("CMakeLists.txt")
Expand All @@ -70,27 +73,32 @@ android {
dependencies {

implementation("org.jetbrains.kotlin:kotlin-stdlib:${libs.versions.kotlin.get()}")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")

implementation("com.google.dagger:hilt-android:${libs.versions.hilt.get()}")
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.appcompat:appcompat:1.4.1")
kapt("com.google.dagger:hilt-compiler:${libs.versions.hilt.get()}")

implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.android.volley:volley:1.2.1")
implementation("com.google.android.material:material:1.5.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.3")
implementation("androidx.fragment:fragment-ktx:1.4.1")
implementation("com.google.android.material:material:1.9.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.fragment:fragment-ktx:1.6.1")
implementation("androidx.slidingpanelayout:slidingpanelayout:1.2.0")
implementation("net.danlew:android.joda:2.10.14")
implementation("androidx.legacy:legacy-support-v4:1.0.0")
implementation("org.jsoup:jsoup:1.14.3")
implementation("com.squareup.okhttp3:okhttp:4.9.3")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${libs.versions.lifecycleViewmodel.get()}")
implementation("androidx.navigation:navigation-fragment-ktx:${libs.versions.navigation.get()}")
implementation("androidx.navigation:navigation-ui-ktx:${libs.versions.navigation.get()}")

kapt("com.google.dagger:hilt-compiler:${libs.versions.hilt.get()}")

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.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
}

kapt {
correctErrorTypes = true
}
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="xyz.lukasz.xword">
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
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:7.1.2")
classpath("com.android.tools.build:gradle:8.1.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
classpath("com.google.dagger:hilt-android-gradle-plugin:${libs.versions.hilt.get()}")
}
Expand Down
12 changes: 11 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Project-wide Gradle settings.

# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
Expand All @@ -7,13 +8,22 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC -Dfile.encoding=UTF-8

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true

# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
kotlin.code.style=official

android.defaults.buildfeatures.buildconfig=true

android.nonTransitiveRClass=false

android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Empty file modified gradlew
100644 → 100755
Empty file.
7 changes: 4 additions & 3 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ include(":app")
dependencyResolutionManagement {
versionCatalogs {
create("libs") {
version("hilt", "2.41")
version("kotlin", "1.6.10")
version("navigation", "2.4.1")
version("hilt", "2.48")
version("kotlin", "1.9.0")
version("navigation", "2.7.3")
version("lifecycleViewmodel", "2.6.2")
}
}
}

0 comments on commit 8247f56

Please sign in to comment.