Skip to content

Update DackkaPlugin to use 1.2.0 #4714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Feb 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions .github/workflows/diff-javadoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: macos-latest
permissions:
pull-requests: write
steps:
- name: Make Dir
- name: Make diff directory
run: mkdir ~/diff

- uses: actions/checkout@v3
- name: Checkout PR branch
uses: actions/checkout@v3
with:
fetch-depth: 2
submodules: true
Expand All @@ -24,31 +25,24 @@ jobs:
distribution: temurin
cache: gradle

- name: Changed Modules
id: changed-modules
run: |
git diff --name-only HEAD~1 | xargs printf -- '--changed-git-paths %s\n' | xargs ./gradlew writeChangedProjects --output-file-path=modules.json --only-firebase-sdks
echo "run=$(cat modules.json | sed "s/[]\"[]//g" | sed "s/,/\n/g" | xargs printf -- "%s:kotlinDoc ")" >> $GITHUB_OUTPUT
- name: Generate docs for PR branch
run: ./gradlew kotlindoc

- name: Build
# Certain SDKs won't export docs, make a blank folder to diff if that's the case
run: mkdir build && ./gradlew ${{ steps.changed-modules.outputs.run }}

- name: Move original docs
- name: Move branch docs to diff directory
run: mv build ~/diff/modified

- uses: actions/checkout@v3
- name: Checkout master
uses: actions/checkout@v3
with:
ref: ${{ github.base_ref }}

- name: Build
# Certain SDKs won't export docs, make a blank folder to diff if that's the case
run: mkdir build && ./gradlew ${{ steps.changed-modules.outputs.run }}
- name: Generate docs for Master
run: ./gradlew kotlindoc

- name: Move modified docs
- name: Move master docs to diff directory
run: mv build ~/diff/original

- name: Diff docs
- name: Get diff between Master and Branch docs
run: >
`# Recursively diff directories, including new files, git style, with 3 lines of context`
diff -wEburN ~/diff/original ~/diff/modified
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package com.google.firebase.appcheck.debug.testing;

import androidx.annotation.NonNull;
import androidx.test.platform.app.InstrumentationRegistry;
import com.google.firebase.FirebaseApp;
import com.google.firebase.appcheck.AppCheckProviderFactory;
import com.google.firebase.appcheck.FirebaseAppCheck;
Expand Down Expand Up @@ -64,8 +65,8 @@
*/
public final class DebugAppCheckTestHelper {
/**
* Creates a {@link DebugAppCheckTestHelper} instance with a debug secret obtained from {@link
* androidx.test.platform.app.InstrumentationRegistry} arguments.
* Creates a {@link DebugAppCheckTestHelper} instance with a debug secret obtained from <br>
* {@link InstrumentationRegistry} arguments.
*/
@NonNull
public static DebugAppCheckTestHelper fromInstrumentationArgs() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
import com.google.firebase.FirebaseApp;
import com.google.firebase.appcheck.AppCheckProvider;
import com.google.firebase.appcheck.AppCheckProviderFactory;
import com.google.firebase.appcheck.FirebaseAppCheck;
import com.google.firebase.appcheck.debug.internal.DebugAppCheckProvider;

/**
* Implementation of an {@link AppCheckProviderFactory} that builds {@link DebugAppCheckProvider}s.
* Implementation of an {@link AppCheckProviderFactory} that builds {@code DebugAppCheckProvider}s.
*/
public class DebugAppCheckProviderFactory implements AppCheckProviderFactory {

Expand All @@ -30,10 +31,10 @@ public class DebugAppCheckProviderFactory implements AppCheckProviderFactory {
private DebugAppCheckProviderFactory() {}

/**
* Gets an instance of this class for installation into a {@link
* com.google.firebase.appcheck.FirebaseAppCheck} instance. If no debug secret is found in {@link
* android.content.SharedPreferences}, a new debug secret will be generated and printed to the
* logcat. The debug secret should then be added to the allow list in the Firebase Console.
* Gets an instance of this class for installation into a {@link FirebaseAppCheck} instance. If no
* debug secret is found in {@link android.content.SharedPreferences}, a new debug secret will be
* generated and printed to the logcat. The debug secret should then be added to the allow list in
* the Firebase Console.
*/
@NonNull
public static DebugAppCheckProviderFactory getInstance() {
Expand Down
6 changes: 0 additions & 6 deletions appcheck/firebase-appcheck-interop/api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,5 @@ package com.google.firebase.appcheck.interop {
method public void onAppCheckTokenChanged(@NonNull com.google.firebase.appcheck.AppCheckTokenResult);
}

public interface InternalAppCheckTokenProvider {
method public void addAppCheckTokenListener(@NonNull com.google.firebase.appcheck.interop.AppCheckTokenListener);
method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckTokenResult> getToken(boolean);
method public void removeAppCheckTokenListener(@NonNull com.google.firebase.appcheck.interop.AppCheckTokenListener);
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.google.android.gms.tasks.Task;
import com.google.firebase.appcheck.AppCheckTokenResult;

/** @hide */
public interface InternalAppCheckTokenProvider {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,19 @@
import com.google.firebase.FirebaseApp;
import com.google.firebase.appcheck.AppCheckProvider;
import com.google.firebase.appcheck.AppCheckProviderFactory;
import com.google.firebase.appcheck.FirebaseAppCheck;
import com.google.firebase.appcheck.playintegrity.internal.PlayIntegrityAppCheckProvider;

/**
* Implementation of an {@link AppCheckProviderFactory} that builds {@link
* PlayIntegrityAppCheckProvider}s. This is the default implementation.
* Implementation of an {@link AppCheckProviderFactory} that builds <br>
* {@link PlayIntegrityAppCheckProvider}s. This is the default implementation.
*/
public class PlayIntegrityAppCheckProviderFactory implements AppCheckProviderFactory {

private static final PlayIntegrityAppCheckProviderFactory instance =
new PlayIntegrityAppCheckProviderFactory();

/**
* Gets an instance of this class for installation into a {@link
* com.google.firebase.appcheck.FirebaseAppCheck} instance.
*/
/** Gets an instance of this class for installation into a {@link FirebaseAppCheck} instance. */
@NonNull
public static PlayIntegrityAppCheckProviderFactory getInstance() {
return instance;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
import com.google.firebase.FirebaseApp;
import com.google.firebase.appcheck.AppCheckProvider;
import com.google.firebase.appcheck.AppCheckProviderFactory;
import com.google.firebase.appcheck.FirebaseAppCheck;
import com.google.firebase.appcheck.safetynet.internal.SafetyNetAppCheckProvider;

/**
* Implementation of an {@link AppCheckProviderFactory} that builds {@link
* SafetyNetAppCheckProvider}s. This is the default implementation.
* Implementation of an {@link AppCheckProviderFactory} that builds <br>
* {@link SafetyNetAppCheckProvider}s. This is the default implementation.
*
* @deprecated Use {@code PlayIntegrityAppCheckProviderFactory} instead.
*/
Expand All @@ -35,8 +36,7 @@ public class SafetyNetAppCheckProviderFactory implements AppCheckProviderFactory
private SafetyNetAppCheckProviderFactory() {}

/**
* Gets an instance of this class for installation into a {@link
* com.google.firebase.appcheck.FirebaseAppCheck} instance.
* Gets an instance of this class for installation into a {@link FirebaseAppCheck} instance.
*
* @deprecated Use {@code PlayIntegrityAppCheckProviderFactory#getInstance} instead.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

/**
* Interface for a provider that generates {@link AppCheckToken}s. This provider can be called at
* any time by any Firebase library that depends (optionally or otherwise) on {@link
* AppCheckToken}s. This provider is responsible for determining if it can create a new token at the
* time of the call and returning that new token if it can.
* any time by any Firebase library that depends (optionally or otherwise) on <br>
* {@link AppCheckToken}s. This provider is responsible for determining if it can create a new token
* at the time of the call and returning that new token if it can.
*/
public interface AppCheckProvider {

Expand Down
46 changes: 0 additions & 46 deletions buildSrc/firesite_transform.sh

This file was deleted.

Loading