From f3d64d23b2673ad6f6d9433adca3015b208f23f1 Mon Sep 17 00:00:00 2001
From: Arty Bishop <bishop.arty@gmail.com>
Date: Sun, 19 Sep 2021 10:53:29 +0100
Subject: [PATCH] Reverted API version to v21, Android 5.0

---
 app/build.gradle                                    |  9 +--------
 app/src/main/AndroidManifest.xml                    |  7 +++----
 .../look4sat/injection/SatelliteDataModule.kt       | 13 +++++--------
 core/build.gradle                                   |  7 -------
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6db45535..a9ff24cf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         applicationId "com.rtbishop.look4sat"
-        minSdkVersion 23
+        minSdkVersion 21
         resConfigs "en,ru"
         targetSdkVersion 31
         versionCode 255
@@ -37,13 +37,6 @@ android {
             }
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    kotlinOptions {
-        jvmTarget = "11"
-    }
     buildFeatures {
         viewBinding true
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f572e55..75c3a94a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,12 +10,11 @@
         android:name=".presentation.Look4SatApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:usesCleartextTraffic="true">
+        android:label="@string/app_name">
         <activity
             android:name=".presentation.Look4SatActivity"
-            android:theme="@style/AppTheme.Splash"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/AppTheme.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/com/rtbishop/look4sat/injection/SatelliteDataModule.kt b/app/src/main/java/com/rtbishop/look4sat/injection/SatelliteDataModule.kt
index 9d9ebae3..fd3a1d21 100644
--- a/app/src/main/java/com/rtbishop/look4sat/injection/SatelliteDataModule.kt
+++ b/app/src/main/java/com/rtbishop/look4sat/injection/SatelliteDataModule.kt
@@ -21,7 +21,10 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.location.LocationManager
 import androidx.room.Room
-import com.rtbishop.look4sat.data.*
+import com.rtbishop.look4sat.data.LocalDataSource
+import com.rtbishop.look4sat.data.PreferencesSource
+import com.rtbishop.look4sat.data.RemoteDataSource
+import com.rtbishop.look4sat.data.SatelliteRepo
 import com.rtbishop.look4sat.domain.Predictor
 import com.rtbishop.look4sat.framework.PreferencesProvider
 import com.rtbishop.look4sat.framework.api.RemoteSource
@@ -34,11 +37,9 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.CoroutineDispatcher
-import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 import javax.inject.Singleton
-import javax.net.ssl.HostnameVerifier
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -100,13 +101,9 @@ object SatelliteDataModule {
 
     @Provides
     fun provideSatelliteService(): SatelliteService {
-        val verifier = HostnameVerifier { _, _ -> true }
-        val httpClient = OkHttpClient.Builder().hostnameVerifier(verifier).build()
         return Retrofit.Builder()
             .baseUrl("https://db.satnogs.org/api/")
-            .client(httpClient)
             .addConverterFactory(MoshiConverterFactory.create())
-            .build()
-            .create(SatelliteService::class.java)
+            .build().create(SatelliteService::class.java)
     }
 }
diff --git a/core/build.gradle b/core/build.gradle
index b0b0327f..08b3dd80 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,15 +1,8 @@
 plugins {
-    id 'java-library'
     id 'kotlin'
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
 
     testImplementation "junit:junit:$junit_version"