From defe38deb12707c1d5b75b51702f171e6e5b8322 Mon Sep 17 00:00:00 2001 From: Zhengyu Peng Date: Mon, 9 May 2022 21:23:33 -0400 Subject: [PATCH] update --- software/android/.idea/gradle.xml | 1 - software/android/app/build.gradle | 3 ++- software/android/app/src/main/AndroidManifest.xml | 3 +-- software/android/build.gradle | 4 ++-- software/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/software/android/.idea/gradle.xml b/software/android/.idea/gradle.xml index 526b4c2..a2d7c21 100644 --- a/software/android/.idea/gradle.xml +++ b/software/android/.idea/gradle.xml @@ -13,7 +13,6 @@ - diff --git a/software/android/app/build.gradle b/software/android/app/build.gradle index d304749..122e935 100644 --- a/software/android/app/build.gradle +++ b/software/android/app/build.gradle @@ -29,13 +29,14 @@ android { kotlinOptions { jvmTarget = '1.8' } + namespace 'com.rookiedev.hexapod' } dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0' implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'com.google.android.material:material:1.5.0' + implementation 'com.google.android.material:material:1.6.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' diff --git a/software/android/app/src/main/AndroidManifest.xml b/software/android/app/src/main/AndroidManifest.xml index f1367b6..f9bd39e 100644 --- a/software/android/app/src/main/AndroidManifest.xml +++ b/software/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/software/android/build.gradle b/software/android/build.gradle index b02d482..897ec02 100644 --- a/software/android/build.gradle +++ b/software/android/build.gradle @@ -5,8 +5,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" + classpath 'com.android.tools.build:gradle:7.2.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/software/android/gradle/wrapper/gradle-wrapper.properties b/software/android/gradle/wrapper/gradle-wrapper.properties index 3235c53..6b027a4 100644 --- a/software/android/gradle/wrapper/gradle-wrapper.properties +++ b/software/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Feb 09 11:03:31 EST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME