Skip to content

Move dagger-android to androidx #1721

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Move dagger-android to androidx #1721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")

maven_install(
artifacts = [
"com.android.support:support-annotations:25.0.0",
"com.android.support:support-fragment:25.0.0",
"com.android.support:appcompat-v7:25.0.0",
"androidx.annotation:annotation:1.1.0",
"androidx.fragment:fragment:1.1.0",
"androidx.appcompat:appcompat:1.1.0",
"org.jetbrains.kotlin:kotlin-stdlib:1.3.50",
"org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.1.0",
],
Expand Down
2 changes: 1 addition & 1 deletion java/dagger/android/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ android_library(
"//:dagger_with_compiler",
"@google_bazel_common//third_party/java/auto:value",
"@google_bazel_common//third_party/java/error_prone:annotations",
"@maven//:com_android_support_support_annotations",
"@maven//:androidx_annotation_annotation",
],
)

Expand Down
2 changes: 1 addition & 1 deletion java/dagger/android/DaggerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import android.app.Activity;
import android.app.Fragment;
import android.os.Bundle;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import dagger.internal.Beta;
import javax.inject.Inject;

Expand Down
2 changes: 1 addition & 1 deletion java/dagger/android/DaggerBroadcastReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.support.annotation.CallSuper;
import androidx.annotation.CallSuper;
import dagger.internal.Beta;

/**
Expand Down
2 changes: 1 addition & 1 deletion java/dagger/android/DaggerContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package dagger.android;

import android.content.ContentProvider;
import android.support.annotation.CallSuper;
import androidx.annotation.CallSuper;
import dagger.internal.Beta;

/** A {@link ContentProvider} that injects its members in {@link #onCreate()}. */
Expand Down
2 changes: 1 addition & 1 deletion java/dagger/android/support/AndroidSupportInjection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import static dagger.internal.Preconditions.checkNotNull;

import android.app.Activity;
import android.support.v4.app.Fragment;
import android.util.Log;
import androidx.fragment.app.Fragment;
import dagger.android.AndroidInjector;
import dagger.android.HasAndroidInjector;
import dagger.internal.Beta;
Expand Down
6 changes: 3 additions & 3 deletions java/dagger/android/support/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ android_library(
"//:dagger_with_compiler",
"//java/dagger/android",
"@google_bazel_common//third_party/java/error_prone:annotations",
"@maven//:com_android_support_appcompat_v7",
"@maven//:com_android_support_support_annotations",
"@maven//:com_android_support_support_fragment",
"@maven//:androidx_appcompat_appcompat",
"@maven//:androidx_annotation_annotation",
"@maven//:androidx_fragment_fragment",
],
)

Expand Down
4 changes: 2 additions & 2 deletions java/dagger/android/support/DaggerAppCompatActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package dagger.android.support;

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import dagger.android.AndroidInjection;
import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector;
Expand Down
4 changes: 2 additions & 2 deletions java/dagger/android/support/DaggerAppCompatDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package dagger.android.support;

import android.content.Context;
import android.support.v4.app.Fragment;
import android.support.v7.app.AppCompatDialogFragment;
import androidx.fragment.app.Fragment;
import androidx.appcompat.app.AppCompatDialogFragment;
import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector;
import dagger.android.HasAndroidInjector;
Expand Down
4 changes: 2 additions & 2 deletions java/dagger/android/support/DaggerDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package dagger.android.support;

import android.content.Context;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector;
import dagger.android.HasAndroidInjector;
Expand Down
2 changes: 1 addition & 1 deletion java/dagger/android/support/DaggerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package dagger.android.support;

import android.content.Context;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector;
import dagger.android.HasAndroidInjector;
Expand Down
2 changes: 1 addition & 1 deletion java/dagger/example/gradle/android/simple/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ android_binary(
"//:android",
"//:android-support",
"//:dagger_with_compiler",
"@maven//:com_android_support_appcompat_v7",
"@maven//:androidx_appcompat_appcompat",
],
)
2 changes: 1 addition & 1 deletion javatests/dagger/android/processor/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ GenJavaTests(
deps = [
"//java/dagger/internal/guava:base",
"//java/dagger/internal/guava:collect",
"@maven//:com_android_support_support_fragment",
"@maven//:androidx_fragment_fragment",
# TODO(ronshapiro): create a common location to define the current Android version
"@androidsdk//:platforms/android-29/android.jar",
"@google_bazel_common//third_party/java/compile_testing",
Expand Down
6 changes: 3 additions & 3 deletions javatests/dagger/android/support/functional/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ android_library(
manifest = "AndroidManifest.xml",
resource_files = glob(["res/**"]),
deps = [
"@maven//:com_android_support_support_fragment",
"@maven//:com_android_support_appcompat_v7",
"@maven//:com_android_support_support_annotations",
"@maven//:androidx_fragment_fragment",
"@maven//:androidx_appcompat_appcompat",
"@maven//:androidx_annotation_annotation",
"//java/dagger/internal/guava:collect",
"//:dagger_with_compiler",
"//:android",
Expand Down
2 changes: 1 addition & 1 deletion javatests/dagger/android/support/functional/TestContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import android.content.ContentValues;
import android.database.Cursor;
import android.net.Uri;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import dagger.android.DaggerContentProvider;
import java.util.Set;
import javax.inject.Inject;
Expand Down