Target Android 13

urbandroid-team · Sep 5, 2023 · 0ad2feb · 0ad2feb
1 parent 1124c28
commit 0ad2feb
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/SleepGarmin-android/app/build.gradle b/SleepGarmin-android/app/build.gradle
@@ -3,13 +3,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 33
+    compileSdk 33
+    namespace "com.urbandroid.sleep.garmin"
+
     defaultConfig {
-        applicationId "com.urbandroid.sleep.garmin"
         minSdkVersion 14
-        targetSdkVersion 31
-        versionCode 37
-        versionName "20230303"
+        targetSdkVersion 33
+        versionCode 38
+        versionName "20230805"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     signingConfigs {
@@ -27,6 +28,7 @@ android {
             signingConfig signingConfigs.release
         }
     }
+    namespace 'com.urbandroid.sleep.garmin'
 }
 
 repositories {
@@ -41,13 +43,20 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.urbandroid:common:1.25@aar'
     implementation 'org.nanohttpd:nanohttpd:2.2.0'
-    testImplementation 'junit:junit:4.12'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    testImplementation 'junit:junit:4.13.2'
+    constraints {
+        implementation("org.jetbrains.kotlin:akotlin-stdlib-jdk7:1.8.0") {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
+    }
 }
diff --git a/SleepGarmin-android/app/src/main/AndroidManifest.xml b/SleepGarmin-android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.urbandroid.sleep.garmin">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

diff --git a/SleepGarmin-android/build.gradle b/SleepGarmin-android/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.7.20'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/SleepGarmin-android/gradle.properties b/SleepGarmin-android/gradle.properties
@@ -12,4 +12,7 @@ projectKeystoreFile=/home/artaud/.android/debug.keystore
 projectKeystoreAlias=androiddebugkey
 projectKeystorePassword=android
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/SleepGarmin-android/gradle/wrapper/gradle-wrapper.properties b/SleepGarmin-android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip