Merge pull request #14 from isaac-udy/typing-overhaul

1.3.0-alpha01 Overhaul
isaac-udy · Dec 28, 2020 · 1ef4c10 · 1ef4c10
2 parents 799bc5b + 9e4b701
commit 1ef4c10
Show file tree

Hide file tree

Showing 97 changed files with 3,235 additions and 1,814 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,4 +18,4 @@ jobs:
       uses: reactivecircus/android-emulator-runner@v2
       with:
         api-level: 29
-        script: ./gradlew :enro-core:connectedCheck
+        script: ./gradlew :enro:connectedCheck
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = "1.4.10"
+    ext.kotlin_version = "1.4.20"
     repositories {
         mavenLocal()
         google()

diff --git a/common.gradle b/common.gradle
@@ -51,6 +51,10 @@ ext.androidLibrary = {
         }
     }
 
+    kotlin {
+        explicitApi()
+    }
+
     dependencies {
         implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     }

diff --git a/enro-annotations/src/main/java/nav/enro/annotations/Annotations.kt b/enro-annotations/src/main/java/nav/enro/annotations/Annotations.kt
@@ -1,13 +1,11 @@
 package nav.enro.annotations
 
 import kotlin.reflect.KClass
-import java.lang.annotation.RetentionPolicy;
 
 @Retention(AnnotationRetention.BINARY)
 @Target(AnnotationTarget.CLASS)
 annotation class NavigationDestination(
-    val key: KClass<out Any>,
-    val allowDefault: Boolean = false
+    val key: KClass<out Any>
 )
 
 @Retention(AnnotationRetention.BINARY)

diff --git a/enro-core/src/androidTest/java/nav/enro/core/TestApplication.kt b/enro-core/src/androidTest/java/nav/enro/core/TestApplication.kt
diff --git a/enro-core/src/androidTest/java/nav/enro/core/TestDestinations.kt b/enro-core/src/androidTest/java/nav/enro/core/TestDestinations.kt
diff --git a/enro-core/src/androidTest/java/nav/enro/core/TestViews.kt b/enro-core/src/androidTest/java/nav/enro/core/TestViews.kt
diff --git a/enro-core/src/androidTest/java/nav/enro/core/overrides/ActivityToActivityOverrideTests.kt b/enro-core/src/androidTest/java/nav/enro/core/overrides/ActivityToActivityOverrideTests.kt
diff --git a/enro-core/src/main/AndroidManifest.xml b/enro-core/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="nav.enro.core">
     <application>
-        <activity android:name=".internal.SingleFragmentActivity" />
-        <activity android:name=".internal.HiltSingleFragmentActivity" />
+        <activity android:name=".fragment.internal.SingleFragmentActivity" />
+        <activity android:name=".fragment.internal.HiltSingleFragmentActivity" />
     </application>
 </manifest>