fix build pipeline

frontegg · Aug 16, 2023 · e8555f9 · e8555f9
1 parent d2a6c0c
commit e8555f9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -60,7 +60,7 @@ jobs:
         uses: gradle/gradle-build-action@v2
 
       - name: Build Libraries
-        run: ./gradlew build --no-daemon
+        run: ./gradlew :app:build --no-daemon
 #      - name: AVD cache
 #        uses: actions/cache@v3
 #        id: avd-cache

diff --git a/README.md b/README.md
@@ -97,14 +97,14 @@ This property will store frontegg hostname (without https) and client id from pr
 
 ```groovy
 
-def fronteggDomain = "FRONTEGG_DOMAIN_HOST.com" // without https://
+def fronteggDomain = "FRONTEGG_DOMAIN_HOST.com" // without protocol https://
 def fronteggClientId = "FRONTEGG_CLIENT_ID"
 
 android {
     defaultConfig {
 
         manifestPlaceholders = [
-                "frontegg_scheme" : applicationId.replace('.', ''),
+                "package_name" : applicationId,
                 "frontegg_domain" : fronteggDomain,
                 "frontegg_client_id": fronteggClientId
         ]
@@ -135,7 +135,6 @@ Add `INTERNET` permission to the app's manifest file.
 
 <uses-permission android:name="android.permission.INTERNET"/>
 <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-
 ```
 
 ### Config Android AssetLinks

diff --git a/android/build.gradle b/android/build.gradle
@@ -15,16 +15,11 @@ android {
 
     defaultConfig {
         minSdk 26
-        targetSdk 33
+        targetSdk 34
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
         versionName "$version"
 
-        manifestPlaceholders = [
-                "frontegg_scheme" : "",
-                "frontegg_domain" : "",
-                "frontegg_client_id": ""
-        ]
     }
 
     buildTypes {

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application>
         <activity
@@ -45,7 +46,7 @@
 
                 <data
                     android:host="${frontegg_domain}"
-                    android:scheme="${frontegg_scheme}" />
+                    android:scheme="${package_name}" />
             </intent-filter>
         </activity>
 

diff --git a/android/src/main/java/com/frontegg/android/utils/Constants.kt b/android/src/main/java/com/frontegg/android/utils/Constants.kt
@@ -23,8 +23,7 @@ class Constants {
             val host = baseUrl.substring("https://".length)
             val packageName = FronteggApp.getInstance().packageName
 
-            val protocol = packageName.replace(Regex("\\."), "")
-            return "${protocol}://${host}/android/oauth/callback"
+            return "${packageName}://${host}/android/oauth/callback"
         }
 
     }

diff --git a/app/build.gradle b/app/build.gradle
@@ -20,7 +20,7 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         manifestPlaceholders = [
-                "frontegg_scheme" : applicationId.replace('.', ''),
+                "package_name" : applicationId,
                 "frontegg_domain" : fronteggDomain,
                 "frontegg_client_id": fronteggClientId
         ]

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".App"
@@ -27,17 +26,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-<!--        <activity-->
-<!--            android:name=".MainActivity"-->
-<!--            android:exported="true"-->
-<!--            android:label="@string/app_name"-->
-<!--            android:theme="@style/Theme.MyApplication.NoActionBar">-->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
 
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
-<!--        </activity>-->
     </application>
 
 </manifest>