Skip to content

Satellite tracker and pass predictor for Android, inspired by Gpredict

Updated dependencies, minor fixes

Arty Bishop4fc76ecbd9dc
diff --git a/app/build.gradle b/app/build.gradle
index 2e0b9e61..9dc7de2c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,7 +40,7 @@ android {
viewBinding true
}
composeOptions {
- kotlinCompilerExtensionVersion compose_version
+ kotlinCompilerExtensionVersion compose_compiler_version
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
@@ -49,17 +49,16 @@ android {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
}
- packagingOptions {
- resources {
- excludes += '/META-INF/{AL2.0,LGPL2.1}'
- }
- }
testOptions {
animationsDisabled true
unitTests.includeAndroidResources true
}
}
+kotlin {
+ jvmToolchain(11)
+}
+
dependencies {
implementation project(":base")
implementation "androidx.core:core-ktx:$core_ktx_version"
@@ -71,7 +70,6 @@ dependencies {
implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
- implementation "androidx.work:work-runtime-ktx:$work_version"
implementation "androidx.room:room-runtime:$room_version"
implementation "androidx.room:room-ktx:$room_version"
kapt "androidx.room:room-compiler:$room_version"
@@ -82,29 +80,33 @@ dependencies {
// implementation "androidx.compose.ui:ui:$compose_version"
// implementation "androidx.compose.ui:ui-tooling:$compose_version"
+// implementation "androidx.compose.runtime:runtime:$compose_version"
+// implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
+// implementation "androidx.compose.compiler:compiler:$compose_compiler_version"
// implementation "androidx.compose.animation:animation:$compose_version"
-// implementation "androidx.compose.foundation:foundation:$compose_version"
+// implementation "androidx.compose.foundation:foundation:$compose_foundation_version"
// implementation "androidx.activity:activity-compose:$activity_compose_version"
-// implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
// implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
-// implementation "androidx.compose.material:material:$compose_version"
-// implementation "androidx.compose.material:material-icons-extended:$compose_version"
+// implementation "androidx.compose.material:material:$compose_material_version"
+// implementation "androidx.compose.material:material-icons-extended:$compose_material_version"
// implementation "com.google.android.material:compose-theme-adapter:$material_adapter_version"
- debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
+// debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
debugImplementation "androidx.fragment:fragment-testing:$fragment_test_version"
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
+
testImplementation "junit:junit:$junit_version"
testImplementation "org.mockito:mockito-core:$mockito_version"
testImplementation "org.robolectric:robolectric:$robolectric_version"
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version"
+
androidTestImplementation "androidx.test:core:$androidx_test_version"
androidTestImplementation "androidx.test:runner:$androidx_test_version"
androidTestImplementation "androidx.test:rules:$androidx_test_version"
androidTestImplementation "androidx.test.ext:junit:$androidx_junit_version"
androidTestImplementation "androidx.test.ext:truth:$androidx_test_version"
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
- androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
+// androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
androidTestImplementation "org.mockito:mockito-android:$mockito_version"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version"
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 81918513..5b613f50 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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.rtbishop.look4sat">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -15,9 +14,9 @@
android:name=".presentation.MainApplication"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
+ android:networkSecurityConfig="@xml/network_security_config"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:networkSecurityConfig="@xml/network_security_config"
android:theme="@style/Theme.Look4Sat.Main">
<activity
android:name=".presentation.MainActivity"
diff --git a/base/build.gradle b/base/build.gradle
index 4c6c7cc7..9dbe9e35 100644
--- a/base/build.gradle
+++ b/base/build.gradle
@@ -2,13 +2,8 @@ plugins {
id "kotlin"
}
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
-
- kotlinOptions {
- jvmTarget = JavaVersion.VERSION_11.toString()
- }
+kotlin {
+ jvmToolchain(11)
}
dependencies {
diff --git a/build.gradle b/build.gradle
index 0f209868..2fca7839 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,36 +1,38 @@
buildscript {
ext {
- hilt_version = '2.44'
- safe_args_version = '2.4.1'
- application_version = '7.3.1'
+ hilt_version = '2.44.2'
+ application_version = '7.4.0'
library_version = '7.1.2'
- kotlin_android_version = '1.6.10'
+ kotlin_android_version = '1.8.0'
core_ktx_version = '1.9.0'
core_splashscreen_version = '1.0.0'
constraint_version = '2.1.4'
lifecycle_version = '2.5.1'
- navigation_version = '2.5.2'
+ navigation_version = '2.5.3'
work_version = '2.7.1'
- room_version = '2.4.3'
+ room_version = '2.5.0'
material_version = '1.6.1'
osmdroid_version = '6.1.14'
json_version = '20220924'
- compose_version = '1.2.1'
- activity_compose_version = '1.4.0'
- material_adapter_version = '1.1.10'
- fragment_test_version = '1.5.3'
+ compose_version = '1.3.3'
+ compose_compiler_version = '1.4.0'
+ compose_foundation_version = '1.3.1'
+ activity_compose_version = '1.6.1'
+ compose_material_version = '1.3.1'
+ material_adapter_version = '1.2.1'
+ fragment_test_version = '1.5.5'
leakcanary_version = '2.9.1'
junit_version = '4.13.2'
- mockito_version = '4.8.1'
+ mockito_version = '4.9.0'
robolectric_version = '4.9'
coroutines_test_version = '1.6.4'
- androidx_test_version = '1.4.0'
- androidx_junit_version = '1.1.3'
- espresso_version = '3.4.0'
+ androidx_test_version = '1.5.0'
+ androidx_junit_version = '1.1.5'
+ espresso_version = '3.5.1'
}
dependencies {
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
- classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$safe_args_version"
+ classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7af4b25a..a784be7b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Aug 07 12:57:36 BST 2022
+#Fri Jan 27 13:22:02 GMT 2023
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index 2f09b498..ff2dc4be 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,8 @@
pluginManagement {
repositories {
- gradlePluginPortal()
google()
mavenCentral()
+ gradlePluginPortal()
}
}
dependencyResolutionManagement {