Skip to content

Commit 5e974c4

Browse files
VinayGuthalrlazo
VinayGuthal
and
rlazo
authored
Modernization packaging (firebase#5276)
Co-authored-by: Rodrigo Lazo Paz <rlazo@google.com>
1 parent b9f0e1d commit 5e974c4

File tree

227 files changed

+9348
-1244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+9348
-1244
lines changed

‎appcheck/firebase-appcheck-debug-testing/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=17.0.2
1+
version=17.1.0
22
latestReleasedVersion=17.0.1

‎appcheck/firebase-appcheck-debug/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=17.0.2
1+
version=17.1.0
22
latestReleasedVersion=17.0.1

‎appcheck/firebase-appcheck-interop/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=17.0.2
1+
version=17.1.0
22
latestReleasedVersion=17.0.1

‎appcheck/firebase-appcheck-playintegrity/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=17.0.2
1+
version=17.1.0
22
latestReleasedVersion=17.0.1

‎appcheck/firebase-appcheck/api.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,23 @@ package com.google.firebase.appcheck {
3232
method public void onAppCheckTokenChanged(@NonNull com.google.firebase.appcheck.AppCheckToken);
3333
}
3434

35+
public final class FirebaseAppCheckKt {
36+
method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
37+
method @NonNull public static operator String component1(@NonNull com.google.firebase.appcheck.AppCheckToken);
38+
method public static operator long component2(@NonNull com.google.firebase.appcheck.AppCheckToken);
39+
method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(@NonNull com.google.firebase.Firebase);
40+
}
41+
42+
}
43+
44+
package com.google.firebase.appcheck.ktx {
45+
46+
public final class FirebaseAppCheckKt {
47+
method @Deprecated @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
48+
method @Deprecated @NonNull public static operator String component1(@NonNull com.google.firebase.appcheck.AppCheckToken);
49+
method @Deprecated public static operator long component2(@NonNull com.google.firebase.appcheck.AppCheckToken);
50+
method @Deprecated @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(@NonNull com.google.firebase.ktx.Firebase);
51+
}
52+
3553
}
3654

‎appcheck/firebase-appcheck/firebase-appcheck.gradle‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
plugins {
1616
id 'firebase-library'
17+
id("kotlin-android")
1718
}
1819

1920
firebaseLibrary {
@@ -44,31 +45,34 @@ android {
4445
}
4546

4647
dependencies {
47-
implementation 'com.google.firebase:firebase-annotations:16.2.0'
48-
implementation 'com.google.firebase:firebase-common:20.3.1'
49-
implementation 'com.google.firebase:firebase-components:17.1.0'
50-
implementation project(':appcheck:firebase-appcheck-interop')
48+
androidTestImplementation "androidx.annotation:annotation:1.0.0"
49+
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
50+
androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
51+
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
52+
androidTestImplementation 'androidx.test:runner:1.2.0'
53+
androidTestImplementation 'junit:junit:4.12'
54+
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
55+
androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
56+
androidTestImplementation project(':appcheck:firebase-appcheck')
57+
androidTestImplementation project(':integ-testing')
58+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
59+
implementation 'androidx.annotation:annotation:1.1.0'
5160
implementation 'com.google.android.gms:play-services-base:18.0.1'
5261
implementation 'com.google.android.gms:play-services-tasks:18.0.1'
53-
62+
implementation 'com.google.firebase:firebase-annotations:16.2.0'
63+
implementation project(':appcheck:firebase-appcheck-interop')
64+
implementation project(path: ':appcheck:firebase-appcheck-interop')
65+
implementation(project(":firebase-common"))
66+
implementation(project(":firebase-common:ktx"))
67+
implementation(project(":firebase-components"))
5468
javadocClasspath 'com.google.auto.value:auto-value-annotations:1.6.6'
55-
56-
testImplementation project(':integ-testing')
69+
testImplementation "androidx.test:core:$androidxTestCoreVersion"
70+
testImplementation "com.google.truth:truth:$googleTruthVersion"
71+
testImplementation "org.robolectric:robolectric:$robolectricVersion"
72+
testImplementation 'androidx.test:rules:1.2.0'
73+
testImplementation 'junit:junit:4.12'
5774
testImplementation 'junit:junit:4.13-beta-2'
5875
testImplementation 'org.mockito:mockito-core:2.25.0'
5976
testImplementation 'org.mockito:mockito-inline:2.25.0'
60-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
61-
testImplementation "com.google.truth:truth:$googleTruthVersion"
62-
testImplementation "androidx.test:core:$androidxTestCoreVersion"
63-
testImplementation 'androidx.test:rules:1.2.0'
64-
65-
androidTestImplementation project(':appcheck:firebase-appcheck')
66-
androidTestImplementation project(':integ-testing')
67-
androidTestImplementation "androidx.test.ext:junit:$androidxTestJUnitVersion"
68-
androidTestImplementation 'androidx.test:runner:1.2.0'
69-
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
70-
androidTestImplementation 'junit:junit:4.12'
71-
androidTestImplementation "androidx.annotation:annotation:1.0.0"
72-
androidTestImplementation 'org.mockito:mockito-core:2.25.0'
73-
androidTestImplementation 'org.mockito:mockito-inline:2.25.0'
74-
}
77+
testImplementation project(':integ-testing')
78+
}

‎appcheck/firebase-appcheck/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=17.0.2
1+
version=17.1.0
22
latestReleasedVersion=17.0.1

‎appcheck/firebase-appcheck/ktx/api.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
// Signature format: 2.0
22
package com.google.firebase.appcheck.ktx {
33

4-
public final class FirebaseAppCheckKt {
5-
method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
6-
method @NonNull public static operator String component1(@NonNull com.google.firebase.appcheck.AppCheckToken);
7-
method public static operator long component2(@NonNull com.google.firebase.appcheck.AppCheckToken);
8-
method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(@NonNull com.google.firebase.ktx.Firebase);
4+
public final class LoggingKt {
95
}
106

117
}

‎appcheck/firebase-appcheck/ktx/ktx.gradle‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
plugins {
1616
id 'firebase-library'
17-
id 'kotlin-android'
17+
id("kotlin-android")
1818
}
1919

2020
firebaseLibrary {
2121
libraryGroup "appcheck"
2222
testLab.enabled = true
23-
publishJavadoc = true
23+
publishJavadoc = false
2424
publishSources = true
2525
}
2626

@@ -52,22 +52,17 @@ android {
5252
}
5353

5454
dependencies {
55-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
56-
57-
implementation 'com.google.firebase:firebase-common:20.3.1'
58-
implementation 'com.google.firebase:firebase-components:17.1.0'
59-
implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
60-
implementation 'androidx.annotation:annotation:1.1.0'
61-
implementation project(path: ':appcheck:firebase-appcheck')
62-
implementation project(path: ':appcheck:firebase-appcheck-interop')
63-
55+
androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
56+
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
57+
androidTestImplementation 'androidx.test:runner:1.2.0'
58+
androidTestImplementation 'junit:junit:4.12'
59+
api(project(":appcheck:firebase-appcheck"))
60+
androidTestImplementation(project(":appcheck:firebase-appcheck-interop"))
61+
api(project(":firebase-common"))
62+
api(project(":firebase-common:ktx"))
63+
implementation(project(":firebase-components"))
64+
testImplementation "com.google.truth:truth:$googleTruthVersion"
6465
testImplementation "org.robolectric:robolectric:$robolectricVersion"
6566
testImplementation 'junit:junit:4.12'
66-
testImplementation "com.google.truth:truth:$googleTruthVersion"
6767
testImplementation 'org.mockito:mockito-core:2.25.0'
68-
69-
androidTestImplementation 'junit:junit:4.12'
70-
androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
71-
androidTestImplementation 'androidx.test:runner:1.2.0'
72-
androidTestImplementation "androidx.test:core:$androidxTestCoreVersion"
73-
}
68+
}

‎appcheck/firebase-appcheck/ktx/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
<application>
1919
<service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
20-
<meta-data android:name="com.google.firebase.components:com.google.firebase.appcheck.ktx.FirebaseAppCheckKtxRegistrar"
20+
<meta-data android:name="com.google.firebase.components:com.google.firebase.appcheck.ktx.FirebaseAppcheckLegacyRegistrar"
2121
android:value="com.google.firebase.components.ComponentRegistrar" />
2222
</service>
2323
</application>
24-
</manifest>
24+
</manifest>

0 commit comments

Comments
 (0)