Merge "Update Dagger2 dependencies." (4f85c6e1) · Commits · e / os / android_frameworks_base

packages/CarSystemUI/Android.bp

+5 −5

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ android_library {
		"androidx.lifecycle_lifecycle-extensions",
		"SystemUI-tags",
		"SystemUI-proto",
		"dagger2-2.19",
		"dagger2",
		"//external/kotlinc:kotlin-annotations",
		],

		@@ -59,7 +59,7 @@ android_library {

		manifest: "AndroidManifest.xml",

		plugins: ["dagger2-compiler-2.19"],
		plugins: ["dagger2-compiler"],

		}

		@@ -104,7 +104,7 @@ android_library {
		"mockito-target-inline-minus-junit4",
		"testables",
		"truth-prebuilt",
		"dagger2-2.19",
		"dagger2",
		"//external/kotlinc:kotlin-annotations",
		],
		libs: [
		@@ -118,7 +118,7 @@ android_library {
		"com.android.systemui",
		],

		plugins: ["dagger2-compiler-2.19"],
		plugins: ["dagger2-compiler"],
		}

		android_app {
		@@ -157,7 +157,7 @@ android_app {

		kotlincflags: ["-Xjvm-default=enable"],

		plugins: ["dagger2-compiler-2.19"],
		plugins: ["dagger2-compiler"],

		required: ["privapp_whitelist_com.android.systemui"],
		}

packages/SystemUI/Android.bp

+4 −4

Original line number	Diff line number	Diff line
		@@ -68,14 +68,14 @@ android_library {
		"iconloader_base",
		"SystemUI-tags",
		"SystemUI-proto",
		"dagger2-2.19",
		"dagger2",
		"jsr330"
		],
		manifest: "AndroidManifest.xml",

		kotlincflags: ["-Xjvm-default=enable"],

		plugins: ["dagger2-compiler-2.19"],
		plugins: ["dagger2-compiler"],
		}

		filegroup {
		@@ -139,7 +139,7 @@ android_library {
		"mockito-target-extended-minus-junit4",
		"testables",
		"truth-prebuilt",
		"dagger2-2.19",
		"dagger2",
		"jsr330"
		],
		libs: [
		@@ -151,7 +151,7 @@ android_library {
		"--extra-packages",
		"com.android.systemui",
		],
		plugins: ["dagger2-compiler-2.19"],
		plugins: ["dagger2-compiler"],
		}

		android_app {

packages/SystemUI/docs/dagger.md

+20 −0

Original line number	Diff line number	Diff line
		@@ -206,10 +206,30 @@ public CustomView(@Named(VIEW_CONTEXT) Context themedViewContext, AttributeSet a

		## Updating Dagger2

		We depend on the Dagger source found in external/dagger2. We should automatically pick up on updates
		when that repository is updated.

		Deprecated:

		Binaries can be downloaded from https://repo1.maven.org/maven2/com/google/dagger/ and then loaded
		into
		[/prebuilts/tools/common/m2/repository/com/google/dagger/](http://cs/android/prebuilts/tools/common/m2/repository/com/google/dagger/)

		The following commands should work, substituting in the version that you are looking for:

		````
		cd prebuilts/tools/common/m2/repository/com/google/dagger/

		wget -r -np -nH --cut-dirs=4 -erobots=off -R "index.html*" -U "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36" https://repo1.maven.org/maven2/com/google/dagger/dagger/2.28.1/

		wget -r -np -nH --cut-dirs=4 -erobots=off -R "index.html*" -U "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36" https://repo1.maven.org/maven2/com/google/dagger/dagger-compiler/2.28.1/

		wget -r -np -nH --cut-dirs=4 -erobots=off -R "index.html*" -U "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36" https://repo1.maven.org/maven2/com/google/dagger/dagger-spi/2.28.1/

		wget -r -np -nH --cut-dirs=4 -erobots=off -R "index.html*" -U "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36" https://repo1.maven.org/maven2/com/google/dagger/dagger-producers/2.28.1/
		````

		Then update `prebuilts/tools/common/m2/Android.bp` to point at your new jars.

		## TODO List