Skip to content

Commit b32ec60

Browse files
feat(auth)!: Remove Dynamic Links, replace with app-links. (#522)
1 parent 9f355bf commit b32ec60

29 files changed

+244
-187
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ GeneratedPluginRegistrant.m
4040
GeneratedPluginRegistrant.java
4141
GeneratedPluginRegistrant.swift
4242
generated_plugin_registrant.dart
43+
generated_plugin_registrant.h
4344
generated_plugin_registrant.cc
45+
generated_plugins.cmake
4446
build/
4547
.flutter-plugins
4648
.flutter-plugins-dependencies

docs/firebase-ui-auth/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ Install dependencies
1717
```sh
1818
flutter pub add firebase_core
1919
flutter pub add firebase_auth
20-
# required for email link sign in and email verification
21-
flutter pub add firebase_dynamic_links
2220
flutter pub add firebase_ui_auth
2321
```
2422

packages/firebase_ui_auth/example/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.swp
66
.DS_Store
77
.atom/
8+
.build/
89
.buildlog/
910
.history
1011
.svn/
12+
.swiftpm/
1113
migrate_working_dir/
1214

1315
# IntelliJ related

packages/firebase_ui_auth/example/android/app/build.gradle

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
id "com.google.gms.google-services"
6+
}
7+
18
def localProperties = new Properties()
29
def localPropertiesFile = rootProject.file('local.properties')
310
if (localPropertiesFile.exists()) {
@@ -6,11 +13,6 @@ if (localPropertiesFile.exists()) {
613
}
714
}
815

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1416
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1517
if (flutterVersionCode == null) {
1618
flutterVersionCode = '1'
@@ -21,25 +23,18 @@ if (flutterVersionName == null) {
2123
flutterVersionName = '1.0'
2224
}
2325

24-
apply plugin: 'com.android.application'
25-
// START: FlutterFire Configuration
26-
apply plugin: 'com.google.gms.google-services'
27-
// END: FlutterFire Configuration
28-
apply plugin: 'kotlin-android'
29-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
30-
3126
android {
3227
namespace 'io.flutter.plugins.firebase_ui_example'
3328
compileSdkVersion flutter.compileSdkVersion
3429
ndkVersion flutter.ndkVersion
3530

3631
compileOptions {
37-
sourceCompatibility JavaVersion.VERSION_1_8
38-
targetCompatibility JavaVersion.VERSION_1_8
32+
sourceCompatibility JavaVersion.VERSION_17
33+
targetCompatibility JavaVersion.VERSION_17
3934
}
4035

4136
kotlinOptions {
42-
jvmTarget = '1.8'
37+
jvmTarget = '17'
4338
}
4439

4540
sourceSets {
@@ -66,7 +61,3 @@ android {
6661
flutter {
6762
source '../..'
6863
}
69-
70-
dependencies {
71-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
72-
}

packages/firebase_ui_auth/example/android/app/src/main/AndroidManifest.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:name="${applicationName}"
66
android:icon="@mipmap/ic_launcher"
77
android:usesCleartextTraffic="true">
8-
8+
<meta-data android:name="flutter_deeplinking_enabled" android:value="false" />
99
<meta-data
1010
android:name="com.facebook.sdk.ApplicationId"
1111
android:value="@string/facebook_app_id"/>
@@ -33,6 +33,14 @@
3333
<action android:name="android.intent.action.MAIN"/>
3434
<category android:name="android.intent.category.LAUNCHER"/>
3535
</intent-filter>
36+
<intent-filter android:autoVerify="true">
37+
<action android:name="android.intent.action.VIEW" />
38+
<category android:name="android.intent.category.DEFAULT" />
39+
<category android:name="android.intent.category.BROWSABLE" />
40+
<data android:scheme="https"
41+
android:host="flutterfire-e2e-tests.firebaseapp.com"
42+
android:pathPrefix="/__/auth/links" />
43+
</intent-filter>
3644
</activity>
3745
<!-- Don't delete the meta-data below.
3846
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

packages/firebase_ui_auth/example/android/build.gradle

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '1.7.10'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
// START: FlutterFire Configuration
10-
classpath 'com.google.gms:google-services:4.3.15'
11-
// END: FlutterFire Configuration
12-
classpath 'com.android.tools.build:gradle:7.4.2'
13-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14-
}
15-
}
16-
171
allprojects {
182
repositories {
193
google()

packages/firebase_ui_auth/example/android/gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.defaults.buildfeatures.buildconfig=true
44
android.nonTransitiveRClass=false
5-
android.nonFinalResIds=false
5+
android.nonFinalResIds=false
6+
7+
# Java 17 settings to suppress Java 8 warnings
8+
kotlin.jvm.target.validation.mode=warning
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
511

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
818

9-
def flutterSdkPath = properties.getProperty("flutter.sdk")
10-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "8.3.0" apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.25" apply false
23+
id "com.google.gms.google-services" version "4.4.2" apply false
24+
}
25+
26+
include ":app"

packages/firebase_ui_auth/example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

0 commit comments

Comments
 (0)