Merge pull request #4 from veepee-oss/update

update github with internal changes
veepee-oss · Jul 4, 2024 · ae479eb · ae479eb
2 parents 3497ecf + e006480
commit ae479eb
Show file tree

Hide file tree

Showing 54 changed files with 638 additions and 514 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,7 +41,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 21
       - name: "Set Release Version Env"
         run: |
           echo "RELEASE_VERSION=${GITHUB_REF##*/v}" >> $GITHUB_ENV

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,6 +12,6 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 21
       - name: Unit Test
         run: ./gradlew testDebugUnitTest
diff --git a/Sample/app/build.gradle b/Sample/app/build.gradle
diff --git a/Sample/app/build.gradle.kts b/Sample/app/build.gradle.kts
@@ -0,0 +1,44 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
+}
+
+android {
+    namespace = "com.veepee.sample"
+
+    defaultConfig {
+        minSdk = 21
+        targetSdk = 34
+        compileSdk = 34
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    buildFeatures {
+        compose = true
+    }
+}
+
+dependencies {
+    testImplementation(libs.test.junit)
+
+    implementation(project(":feature_a"))
+    implementation(project(":feature_b"))
+    implementation(project(":login"))
+    implementation(project(":routes"))
+    implementation(libs.androidx.design)
+    implementation(libs.androidx.compose.material)
+}
diff --git a/Sample/app/proguard-rules.pro b/Sample/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

diff --git a/Sample/app/src/main/java/com/veepee/sample/MainActivity.kt b/Sample/app/src/main/java/com/veepee/sample/MainActivity.kt
@@ -18,12 +18,13 @@ package com.veepee.sample
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import com.veepee.routes.create
+import com.veepee.routes.Schemas
 import com.veepee.routes.feature_a.ActivityALink
 import com.veepee.routes.feature_b.ActivityBLink
 import com.veepee.routes.feature_b.ActivityBParameter
 import com.veepee.routes.router
 import com.veepee.vpcore.route.link.deeplink.UriDeepLink
+import com.veepee.vpcore.route.link.deeplink.UriParameter
 
 class MainActivity : AppCompatActivity() {
 
@@ -32,7 +33,7 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
         val uri = intent.data
         if (uri != null) {
-            val deepLink = UriDeepLink.create(uri)
+            val deepLink = UriDeepLink(UriParameter(uri), Schemas.MyApp)
             router.route(this, deepLink)
             finish()
         }

diff --git a/Sample/app/src/main/java/com/veepee/sample/SampleApplication.kt b/Sample/app/src/main/java/com/veepee/sample/SampleApplication.kt
@@ -47,9 +47,9 @@ class SampleApplication : Application() {
             add(FeatureADeepLinkMapper)
             add(LoginDeepLinkMapper)
 
-            add(DeepLinkAuthenticationInterceptor)
-            add(ActivityLinkAuthenticationInterceptor)
-            add(FragmentLinkAuthenticationInterceptor)
+            add(0, DeepLinkAuthenticationInterceptor)
+            add(0, ActivityLinkAuthenticationInterceptor)
+            add(0, FragmentLinkAuthenticationInterceptor)
             add(FeatureBComposableNameMapper)
         }
     }

diff --git a/Sample/build.gradle b/Sample/build.gradle
diff --git a/Sample/build.gradle.kts b/Sample/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.android) apply false
+}
diff --git a/Sample/feature_a/build.gradle b/Sample/feature_a/build.gradle
@@ -1,14 +1,16 @@
 plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
     namespace  "com.veepee.feature.a"
+
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
-        compileSdk 33
+        targetSdkVersion 34
+        compileSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -17,33 +19,24 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "17"
     }
+
     buildFeatures {
         compose true
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.4.6'
-    }
 }
 
 dependencies {
-
-    implementation libs.lang.kotlin
-    implementation libs.androidx.core
-    implementation libs.androidx.appcompat
-    implementation libs.material
-    implementation libs.androidx.constraint.layout
-    implementation libs.androidx.fragment
     implementation project(":routes")
-    implementation libs.androidx.compose.foundation
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.appcompat)
 }
diff --git a/Sample/feature_b/build.gradle b/Sample/feature_b/build.gradle
@@ -1,15 +1,16 @@
 plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
     namespace "com.veepee.feature.b"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
-        compileSdk 33
+        targetSdkVersion 34
+        compileSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -22,29 +23,21 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
+
     buildFeatures {
         compose true
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.4.6'
-    }
 }
 
 
 dependencies {
-    implementation libs.lang.kotlin
-    implementation libs.androidx.core
-    implementation libs.androidx.appcompat
-    implementation libs.material
-    implementation libs.androidx.constraint.layout
-    implementation libs.androidx.fragment
     implementation project(":routes")
-    implementation libs.androidx.compose.foundation
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.appcompat)
 }
diff --git a/Sample/feature_b/src/main/java/com/veepee/feature/b/routes/FeatureBComposableNameMapper.kt b/Sample/feature_b/src/main/java/com/veepee/feature/b/routes/FeatureBComposableNameMapper.kt
@@ -23,6 +23,7 @@ import androidx.compose.ui.Modifier
 import com.veepee.routes.feature_b.ComposableBNames
 import com.veepee.routes.feature_b.FeatureBComposableEvent
 import com.veepee.routes.feature_b.FeatureBComposableLink
+import com.veepee.vpcore.route.link.compose.ComposableEvent
 import com.veepee.vpcore.route.link.compose.ComposableLink
 import com.veepee.vpcore.route.link.compose.ComposableNameMapper
 import com.veepee.vpcore.route.link.compose.events.LocalLinkRouterEventHandler
@@ -33,15 +34,15 @@ object FeatureBComposableNameMapper : ComposableNameMapper<ComposableBNames> {
 
     @Composable
     override fun Map(
-        composableLink: ComposableLink<ComposableBNames>,
+        link: ComposableLink<ComposableBNames, ComposableEvent>,
         modifier: Modifier
     ) {
         val handler = LocalLinkRouterEventHandler.current
-        when (composableLink) {
+        when (link) {
             is FeatureBComposableLink -> BasicText(
-                composableLink.parameter.message,
+                link.parameter.message,
                 modifier.clickable {
-                    handler.publish(FeatureBComposableEvent(composableLink.parameter.message.length))
+                    handler.publish(FeatureBComposableEvent(link.parameter.message.length))
                 })
         }
     }

diff --git a/Sample/gradle/wrapper/gradle-wrapper.jar b/Sample/gradle/wrapper/gradle-wrapper.jar
diff --git a/Sample/gradle/wrapper/gradle-wrapper.properties b/Sample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists