Skip to content

Commit ceb740d

Browse files
ywmei-brt1y5mei
andauthored
Ywmei/windows build (#3801)
* Support Sync firebase-android-sdk on Windows PC Ref: #2311 (comment) * change licenseUris * update unit test Co-authored-by: y5mei <[email protected]>
1 parent 4e566d9 commit ceb740d

File tree

8 files changed

+23
-17
lines changed

8 files changed

+23
-17
lines changed

buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/ThirdPartyLicensesExtension.java

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

1515
package com.google.firebase.gradle.plugins.license;
1616

17+
import java.io.File;
1718
import java.io.Serializable;
1819
import java.net.URI;
1920
import java.util.ArrayList;
@@ -27,18 +28,25 @@ public class ThirdPartyLicensesExtension {
2728
* supported
2829
*/
2930
public void add(String name, String... licenseUris) {
30-
customLicenses.add(new CustomLicense(name, licenseUris));
31+
customLicenses.add(CustomLicense.buildFromStrings(name, licenseUris));
3132
}
3233

3334
static class CustomLicense implements Serializable {
3435
final String name;
35-
final List<URI> licenseUris = new ArrayList<>();
36+
final List<URI> licenseUris;
3637

37-
CustomLicense(String name, String[] licenseUris) {
38+
CustomLicense(String name, List<URI> licenseUris) {
3839
this.name = name;
40+
this.licenseUris = licenseUris;
41+
}
42+
43+
static CustomLicense buildFromStrings(String name, String[] licenseUris) {
44+
List<URI> uris = new ArrayList<>();
3945
for (String s : licenseUris) {
40-
this.licenseUris.add(URI.create(s));
46+
File file = new File(s);
47+
uris.add(file.toURI());
4148
}
49+
return new CustomLicense(name, uris);
4250
}
4351
}
4452

buildSrc/src/main/java/com/google/firebase/gradle/plugins/publish/PublishingPlugin.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import com.google.common.collect.ImmutableMap;
1818
import com.google.firebase.gradle.plugins.FirebaseLibraryExtension;
1919
import digital.wup.android_maven_publish.AndroidMavenPublishPlugin;
20-
import java.net.URI;
20+
import java.io.File;
2121
import java.util.Arrays;
2222
import java.util.Set;
2323
import java.util.stream.Collectors;
@@ -118,11 +118,9 @@ public void apply(Project project) {
118118
repos ->
119119
repos.maven(
120120
repo -> {
121-
repo.setUrl(
122-
URI.create(
123-
"file://"
124-
+ sub.getRootProject().getBuildDir()
125-
+ "/m2repository"));
121+
String s = sub.getRootProject().getBuildDir() + "/m2repository";
122+
File file = new File(s);
123+
repo.setUrl(file.toURI());
126124
repo.setName("BuildDir");
127125
}));
128126
publishing.publications(

buildSrc/src/test/kotlin/com/google/firebase/gradle/plugins/LicenseResolverPluginTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class LicenseResolverPluginTests {
7979
android.compileSdkVersion = 26
8080
8181
thirdPartyLicenses {
82-
add 'customLib', "file:///${File("non_existent_path.txt").absolutePath}"
82+
add 'customLib', "${File("non_existent_path.txt").absolutePath}"
8383
}
8484
""")
8585

@@ -141,7 +141,7 @@ class LicenseResolverPluginTests {
141141
}
142142
143143
thirdPartyLicenses {
144-
add 'customLib1', "file:///${File("src/test/fixtures/license.txt").absolutePath}"
144+
add 'customLib1', "${File("src/test/fixtures/license.txt").absolutePath}"
145145
}
146146
"""
147147
}

firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def fixTrampolineFilenames(variantBaseName) {
109109
}
110110

111111
thirdPartyLicenses {
112-
add 'Crashpad', "file://${rootDir}/third_party/licenses/apache-2.0.txt"
112+
add 'Crashpad', "${rootDir}/third_party/licenses/apache-2.0.txt"
113113
}
114114

115115
dependencies {

firebase-crashlytics/firebase-crashlytics.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ android {
5353
}
5454

5555
thirdPartyLicenses {
56-
add 'Tape', "file://${projectDir}/third_party_licenses/tape/LICENSE"
56+
add 'Tape', "${projectDir}/third_party_licenses/tape/LICENSE"
5757
}
5858

5959
dependencies {

firebase-inappmessaging-display/firebase-inappmessaging-display.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ android {
6969

7070

7171
thirdPartyLicenses {
72-
add 'Dagger', "file://${rootDir}/third_party/licenses/apache-2.0.txt"
72+
add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
7373
}
7474

7575
dependencies {

firebase-inappmessaging/firebase-inappmessaging.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ configurations.all {
106106

107107

108108
thirdPartyLicenses {
109-
add 'Dagger', "file://${rootDir}/third_party/licenses/apache-2.0.txt"
109+
add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
110110
}
111111

112112
dependencies {

transport/transport-runtime/transport-runtime.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ android {
9696
}
9797

9898
thirdPartyLicenses {
99-
add 'Dagger', "file://${rootDir}/third_party/licenses/apache-2.0.txt"
99+
add 'Dagger', "${rootDir}/third_party/licenses/apache-2.0.txt"
100100
}
101101

102102
dependencies {

0 commit comments

Comments
 (0)