Merge pull request #403 from skedgo/feature/20331-TKUIHomeViewControl…

…ler-unit-test [20331] TKUIHomeViewController unit test with Gradle and Kotlin updates.
skedgo · Jan 8, 2024 · 2b5604f · 2b5604f
2 parents 4939569 + 5712c23
commit 2b5604f
Show file tree

Hide file tree

Showing 27 changed files with 145 additions and 71 deletions.
diff --git a/CommonCoreLegacy/build.gradle b/CommonCoreLegacy/build.gradle
@@ -3,16 +3,14 @@ apply plugin: "com.android.library"
 // See https://jitpack.io/docs/ANDROID/.
 apply plugin: "kotlin-android"
 apply plugin: "kotlin-kapt"
-apply plugin: 'kotlin-android-extensions'
-apply plugin: "org.jetbrains.kotlin.android.extensions"
 apply plugin: 'maven-publish'
+apply plugin: 'kotlin-parcelize'
 
 android {
-    compileSdkVersion versions.compileSdkVersion
 
-    androidExtensions {
-        experimental = true
-    }
+    namespace 'com.skedgo.tripkit.common'
+
+    compileSdkVersion versions.compileSdkVersion
 
     defaultConfig {
         minSdkVersion versions.proMinSdkVersion
@@ -38,8 +36,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     publishing {
@@ -89,7 +87,7 @@ dependencies {
 // build a jar with source files
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 task javadoc(type: Javadoc) {
@@ -104,7 +102,7 @@ task javadoc(type: Javadoc) {
 
 // build a jar with javadoc
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc.destinationDir
 }
 

diff --git a/CommonCoreLegacy/src/main/AndroidManifest.xml b/CommonCoreLegacy/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.skedgo.tripkit.common"
+<manifest
   xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.INTERNET" />

diff --git a/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/regionrouting/data/Direction.kt b/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/regionrouting/data/Direction.kt
@@ -6,7 +6,7 @@ import com.skedgo.tripkit.common.util.KParcelable
 import com.skedgo.tripkit.common.util.parcelableCreator
 import com.skedgo.tripkit.routing.ModeInfo
 import com.skedgo.tripkit.routing.ServiceColor
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 data class Direction(
         val encodedShape: String?,

diff --git a/TripKitAndroid/build.gradle b/TripKitAndroid/build.gradle
@@ -5,14 +5,13 @@ apply plugin: 'maven-publish'
 apply plugin: "kotlin-android"
 apply plugin: "kotlin-kapt"
 apply plugin: 'org.jetbrains.dokka'
-apply plugin: 'org.jetbrains.kotlin.android.extensions'
+apply plugin: 'kotlin-parcelize'
 
 android {
-  compileSdkVersion versions.compileSdkVersion
 
-  androidExtensions {
-    experimental = true
-  }
+  namespace 'com.skedgo.tripkit'
+
+  compileSdkVersion versions.compileSdkVersion
 
   defaultConfig {
       minSdkVersion versions.proMinSdkVersion
@@ -28,11 +27,11 @@ android {
 
   compileOptions {
     coreLibraryDesugaringEnabled true
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
   kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_1_8.toString()
+    jvmTarget = JavaVersion.VERSION_17.toString()
   }
   testOptions {
     unitTests {
@@ -111,6 +110,8 @@ dependencies {
   implementation libs.map_extension
   implementation libs.location
 
+  testImplementation libs.mockk
+
   debugApi project(':CommonCoreLegacy')
   releaseApi project(':CommonCoreLegacy')
   debugApi project(':TripKitDomain')
@@ -130,7 +131,7 @@ dependencies {
 // build a jar with source files
 task sourcesJar(type: Jar) {
   from android.sourceSets.main.java.srcDirs
-  classifier = 'sources'
+  archiveClassifier.set('sources')
 }
 
 task javadoc(type: Javadoc) {
@@ -145,7 +146,7 @@ task javadoc(type: Javadoc) {
 
 // build a jar with javadoc
 task javadocJar(type: Jar, dependsOn: javadoc) {
-  classifier = 'javadoc'
+  archiveClassifier.set('javadoc')
   from javadoc.destinationDir
 }
 

diff --git a/TripKitAndroid/src/main/AndroidManifest.xml b/TripKitAndroid/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.skedgo.tripkit">
+<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" />

diff --git a/TripKitAndroid/src/main/java/com/skedgo/rxtry/Try.kt b/TripKitAndroid/src/main/java/com/skedgo/rxtry/Try.kt
@@ -1,6 +1,6 @@
 package com.skedgo.rxtry
 
-sealed class Try<T>
+open class Try<T>
 
 data class Success<T>(private val value: T) : Try<T>() {
   operator fun invoke() = value

diff --git a/TripKitAndroid/src/main/java/com/skedgo/tripkit/RoutingUserError.kt b/TripKitAndroid/src/main/java/com/skedgo/tripkit/RoutingUserError.kt
@@ -1,6 +1,6 @@
 package com.skedgo.tripkit
 
-sealed class RoutingError(detailMessage: String) : RuntimeException(detailMessage)
+open class RoutingError(detailMessage: String) : RuntimeException(detailMessage)
 
 class RoutingUserError(detailMessage: String) : RoutingError(detailMessage)
 

diff --git a/TripKitData/build.gradle b/TripKitData/build.gradle
@@ -4,8 +4,12 @@ apply plugin: "com.android.library"
 apply plugin: 'maven-publish'
 apply plugin: "kotlin-android"
 apply plugin: "kotlin-kapt"
+apply plugin: 'kotlin-parcelize'
 
 android {
+
+  namespace 'skedgo.tripkit.data'
+
   compileSdkVersion versions.compileSdkVersion
 
   defaultConfig {
@@ -24,12 +28,12 @@ android {
     warning "InvalidPackage"
   }
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 
   kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_1_8.toString()
+    jvmTarget = JavaVersion.VERSION_17.toString()
   }
 
   publishing {
@@ -121,7 +125,7 @@ kapt {
 // build a jar with source files
 task sourcesJar(type: Jar) {
   from android.sourceSets.main.java.srcDirs
-  classifier = 'sources'
+  archiveClassifier.set('sources')
 }
 
 task javadoc(type: Javadoc) {
@@ -136,7 +140,7 @@ task javadoc(type: Javadoc) {
 
 // build a jar with javadoc
 task javadocJar(type: Jar, dependsOn: javadoc) {
-  classifier = 'javadoc'
+  archiveClassifier.set('javadoc')
   from javadoc.destinationDir
 }
 

diff --git a/TripKitData/src/main/AndroidManifest.xml b/TripKitData/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="skedgo.tripkit.data" xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <application />
 </manifest>
diff --git a/...itData/src/main/java/com/skedgo/tripkit/data/database/locations/bikepods/BikePodEntity.kt b/...itData/src/main/java/com/skedgo/tripkit/data/database/locations/bikepods/BikePodEntity.kt
@@ -11,7 +11,7 @@ import androidx.room.PrimaryKey
 @Keep
 class BikePodLocationEntity {
   @PrimaryKey
-  lateinit var identifier: String
+  var identifier: String = ""
   var cellId: String? = null
   var lat: Double = 0.0
   var lng: Double = 0.0

diff --git a/...rc/main/java/com/skedgo/tripkit/data/database/locations/carparks/CarParkLocationEntity.kt b/...rc/main/java/com/skedgo/tripkit/data/database/locations/carparks/CarParkLocationEntity.kt
@@ -7,7 +7,7 @@ import androidx.room.*
 class CarParkLocationEntity {
 
   @PrimaryKey
-  lateinit var identifier: String
+  var identifier: String = ""
   lateinit var cellId: String
   lateinit var name: String
   var lat: Double = 0.0
@@ -30,7 +30,7 @@ class CarParkLocationEntity {
 )])
 class OpeningDayEntity {
   @PrimaryKey
-  lateinit var id: String
+  var id: String = ""
 
   @ColumnInfo(index = true)
   lateinit var carParkId: String
@@ -69,7 +69,7 @@ class ParkingOperatorEntity {
 )])
 class PricingTableEntity {
   @PrimaryKey
-  lateinit var id: String
+  var id: String = ""
   lateinit var title: String
   var subtitle: String? = null
   lateinit var currencySymbol: String

diff --git a/TripKitData/src/main/java/com/skedgo/tripkit/data/database/locations/carpods/CarPodEntity.kt b/TripKitData/src/main/java/com/skedgo/tripkit/data/database/locations/carpods/CarPodEntity.kt
@@ -1,12 +1,12 @@
 package com.skedgo.tripkit.data.database.locations.carpods
 
 import androidx.room.*
-import androidx.room.ForeignKey.CASCADE
+import androidx.room.ForeignKey.Companion.CASCADE
 
 @Entity(tableName = "carPods")
 class CarPodEntity {
     @PrimaryKey
-    lateinit var id: String
+    var id: String = ""
     var address: String? = null
     lateinit var cellId: String
     var lat: Double = 0.0

diff --git a/...ava/com/skedgo/tripkit/data/database/locations/freefloating/FreeFloatingLocationEntity.kt b/...ava/com/skedgo/tripkit/data/database/locations/freefloating/FreeFloatingLocationEntity.kt
@@ -10,7 +10,7 @@ import com.skedgo.tripkit.parkingspots.models.Parking
 @Keep
 class FreeFloatingLocationEntity {
     @PrimaryKey
-    lateinit var identifier: String
+    var identifier: String = ""
     var cellId: String? = null
     var lat: Double = 0.0
     var lng: Double = 0.0

diff --git a/.../java/com/skedgo/tripkit/data/database/locations/onstreetparking/OnStreetParkingEntity.kt b/.../java/com/skedgo/tripkit/data/database/locations/onstreetparking/OnStreetParkingEntity.kt
@@ -8,7 +8,7 @@ import com.skedgo.tripkit.parkingspots.models.Parking
 @TypeConverters(VacancyConverters::class)
 class OnStreetParkingEntity {
   @PrimaryKey
-  lateinit var identifier: String
+  var identifier: String = ""
   lateinit var cellId: String
   lateinit var name: String
   lateinit var encodedPolyline: String

diff --git a/TripKitData/src/main/java/com/skedgo/tripkit/data/database/stops/StopLocationEntity.kt b/TripKitData/src/main/java/com/skedgo/tripkit/data/database/stops/StopLocationEntity.kt
@@ -15,7 +15,7 @@ class StopLocationEntity {
 
   var address: String? = null
   @PrimaryKey
-  lateinit var code: String
+  var code: String = ""
   lateinit var name: String
   var popularify: Int = 0
   lateinit var services: String

diff --git a/TripKitDomain/build.gradle b/TripKitDomain/build.gradle
@@ -28,12 +28,12 @@ dependencies {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-  classifier = 'sources'
+  archiveClassifier.set('sources')
   from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-  classifier = 'javadoc'
+  archiveClassifier.set('javadoc')
   from javadoc.destinationDir
 }
 

diff --git a/TripKitDomainLegacy/build.gradle b/TripKitDomainLegacy/build.gradle
@@ -6,6 +6,9 @@ apply plugin: "kotlin-kapt"
 apply plugin: "maven-publish"
 
 android {
+
+  namespace 'skedgo.tripkit.domain.legacy'
+
   compileSdkVersion versions.compileSdkVersion
 
   defaultConfig {
@@ -18,6 +21,14 @@ android {
     warning 'InvalidPackage'
   }
 
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
+  }
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_17.toString()
+  }
+
   publishing {
     singleVariant("release") {
       // if you don't want sources/javadoc, remove these lines
@@ -46,7 +57,7 @@ dependencies {
 // build a jar with source files
 task sourcesJar(type: Jar) {
   from android.sourceSets.main.java.srcDirs
-  classifier = 'sources'
+  archiveClassifier.set('sources')
 }
 
 task javadoc(type: Javadoc) {
@@ -61,7 +72,7 @@ task javadoc(type: Javadoc) {
 
 // build a jar with javadoc
 task javadocJar(type: Jar, dependsOn: javadoc) {
-  classifier = 'javadoc'
+  archiveClassifier.set('javadoc')
   from javadoc.destinationDir
 }
 

diff --git a/TripKitSamples/build.gradle b/TripKitSamples/build.gradle
@@ -6,6 +6,7 @@ android {
     compileSdkVersion versions.compileSdkVersion
 
     buildFeatures {
+        viewBinding true
         dataBinding true
     }
 
@@ -31,8 +32,8 @@ android {
     lintOptions { abortOnError false }
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }