Skip to content

Commit

Permalink
Upgrade Gradle & dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
viral32111 committed Jul 20, 2023
1 parent 1f30853 commit 9e3e110
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 23 deletions.
34 changes: 18 additions & 16 deletions App/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ plugins {

android {

compileSdk 32
compileSdk 34

defaultConfig {
applicationId "com.viral32111.locationsharing"

minSdk 21
targetSdk 32
targetSdk 34

versionCode 1
versionName "0.1.0"
Expand All @@ -34,35 +34,37 @@ android {
kotlinOptions {
jvmTarget = "1.8"
}
namespace 'com.viral32111.locationsharing'
buildToolsVersion '34.0.0'

}

dependencies {

// Android
implementation "androidx.core:core-ktx:1.8.0"
implementation "androidx.appcompat:appcompat:1.5.0"
implementation "com.google.android.material:material:1.6.1"
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.9.0'
implementation "androidx.constraintlayout:constraintlayout:2.1.4"

// Android Coroutines
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1"
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1'

// Ktor
implementation "io.ktor:ktor-client-core:2.1.1"
implementation "io.ktor:ktor-client-android:2.1.1"
implementation 'io.ktor:ktor-client-core:2.3.2'
implementation 'io.ktor:ktor-client-android:2.3.2'

// Ktor Json
implementation "io.ktor:ktor-client-content-negotiation:2.1.1"
implementation "io.ktor:ktor-serialization-gson:2.1.1"
implementation 'io.ktor:ktor-client-content-negotiation:2.3.2'
implementation 'io.ktor:ktor-serialization-gson:2.3.2'

// Testing
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'

}
3 changes: 1 addition & 2 deletions App/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"
xmlns:tools="http://schemas.android.com/tools"
package="com.viral32111.locationsharing">
xmlns:tools="http://schemas.android.com/tools">

<!-- Grants access to the Internet -->
<uses-permission android:name="android.permission.INTERNET" />
Expand Down
4 changes: 2 additions & 2 deletions App/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

plugins {
id "com.android.application" version "7.2.2" apply false
id "com.android.library" version "7.2.2" apply false
id "com.android.application" version '8.0.2' apply false
id "com.android.library" version '8.0.2' apply false
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
}

Expand Down
2 changes: 2 additions & 0 deletions App/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ kotlin.code.style = official
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass = true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
6 changes: 3 additions & 3 deletions App/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Sep 06 16:38:36 BST 2022
#Thu Jul 20 14:42:39 BST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 9e3e110

Please sign in to comment.