Merge pull request #237 from google/cb/google

Migrate to new package name

README.md

@@ -65,5 +65,5 @@ limitations under the License.
 
 [appcompat]: https://developer.android.com/jetpack/androidx/releases/appcompat
 [compose]: https://developer.android.com/jetpack/compose
-[snap]: https://oss.sonatype.org/content/repositories/snapshots/dev/chrisbanes/accompanist/
+[snap]: https://oss.sonatype.org/content/repositories/snapshots/com/google/accompanist/
 [mdc]: https://material.io/develop/android/

appcompat-theme/README.md

@@ -1,6 +1,6 @@
 # AppCompat Compose Theme Adapter
 
-[![Maven Central](https://img.shields.io/maven-central/v/dev.chrisbanes.accompanist/accompanist-appcompat-theme)](https://search.maven.org/search?q=g:dev.chrisbanes.accompanist)
+[![Maven Central](https://img.shields.io/maven-central/v/com.google.accompanist/accompanist-appcompat-theme)](https://search.maven.org/search?q=g:com.google.accompanist)
 
 AppCompat Compose Theme Adapter enables reuse of [AppCompat][appcompat] XML themes, for theming in [Jetpack Compose][compose].
 
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation "dev.chrisbanes.accompanist:accompanist-appcompat-theme:<version>"
+    implementation "com.google.accompanist:accompanist-appcompat-theme:<version>"
 }
 ```
 
@@ -34,4 +34,4 @@ Snapshots of the development version are available in Sonatype's `snapshots` [re
   [appcompat]: https://developer.android.com/jetpack/androidx/releases/appcompat
   [compose]: https://developer.android.com/jetpack/compose
   [appcompat]: https://developer.android.com/jetpack/androidx/releases/appcompat
-  [snap]: https://oss.sonatype.org/content/repositories/snapshots/dev/chrisbanes/accompanist/accompanist-appcompat-theme/
+  [snap]: https://oss.sonatype.org/content/repositories/snapshots/com/google/accompanist/accompanist-appcompat-theme/

appcompat-theme/api/appcompat-theme.api

@@ -1,16 +1,16 @@
-public final class dev/chrisbanes/accompanist/appcompattheme/AppCompatTheme {
+public final class com/google/accompanist/appcompattheme/AppCompatTheme {
 	public static final fun AppCompatTheme (Landroid/content/Context;ZZLandroidx/compose/material/Shapes;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
-	public static final fun createAppCompatTheme (Landroid/content/Context;ZZ)Ldev/chrisbanes/accompanist/appcompattheme/ThemeParameters;
-	public static synthetic fun createAppCompatTheme$default (Landroid/content/Context;ZZILjava/lang/Object;)Ldev/chrisbanes/accompanist/appcompattheme/ThemeParameters;
+	public static final fun createAppCompatTheme (Landroid/content/Context;ZZ)Lcom/google/accompanist/appcompattheme/ThemeParameters;
+	public static synthetic fun createAppCompatTheme$default (Landroid/content/Context;ZZILjava/lang/Object;)Lcom/google/accompanist/appcompattheme/ThemeParameters;
 }
 
-public final class dev/chrisbanes/accompanist/appcompattheme/ThemeParameters {
+public final class com/google/accompanist/appcompattheme/ThemeParameters {
 	public static final field $stable I
 	public fun <init> (Landroidx/compose/material/Colors;Landroidx/compose/material/Typography;)V
 	public final fun component1 ()Landroidx/compose/material/Colors;
 	public final fun component2 ()Landroidx/compose/material/Typography;
-	public final fun copy (Landroidx/compose/material/Colors;Landroidx/compose/material/Typography;)Ldev/chrisbanes/accompanist/appcompattheme/ThemeParameters;
-	public static synthetic fun copy$default (Ldev/chrisbanes/accompanist/appcompattheme/ThemeParameters;Landroidx/compose/material/Colors;Landroidx/compose/material/Typography;ILjava/lang/Object;)Ldev/chrisbanes/accompanist/appcompattheme/ThemeParameters;
+	public final fun copy (Landroidx/compose/material/Colors;Landroidx/compose/material/Typography;)Lcom/google/accompanist/appcompattheme/ThemeParameters;
+	public static synthetic fun copy$default (Lcom/google/accompanist/appcompattheme/ThemeParameters;Landroidx/compose/material/Colors;Landroidx/compose/material/Typography;ILjava/lang/Object;)Lcom/google/accompanist/appcompattheme/ThemeParameters;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getColors ()Landroidx/compose/material/Colors;
 	public final fun getTypography ()Landroidx/compose/material/Typography;

appcompat-theme/build.gradle

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import dev.chrisbanes.accompanist.buildsrc.Libs
+import com.google.accompanist.buildsrc.Libs
 
 plugins {
     id 'com.android.library'

appcompat-theme/src/androidTest/AndroidManifest.xml

@@ -15,7 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.chrisbanes.accompanist.appcompattheme">
+    package="com.google.accompanist.appcompattheme">
 
     <uses-sdk android:targetSdkVersion="29" />
 

appcompat-theme/src/androidTest/java/dev/chrisbanes/accompanist/appcompattheme/AppCompatThemeTest.kt → appcompat-theme/src/androidTest/java/com/google/accompanist/appcompattheme/AppCompatThemeTest.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.chrisbanes.accompanist.appcompattheme
+package com.google.accompanist.appcompattheme
 
 import android.view.ContextThemeWrapper
 import androidx.annotation.StyleRes
@@ -35,7 +35,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.font.toFontFamily
 import androidx.test.filters.LargeTest
 import androidx.test.filters.SdkSuppress
-import dev.chrisbanes.accompanist.appcompattheme.test.R
+import com.google.accompanist.appcompattheme.test.R
 import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test

appcompat-theme/src/androidTest/java/dev/chrisbanes/accompanist/appcompattheme/DarkAppCompatActivity.kt → appcompat-theme/src/androidTest/java/com/google/accompanist/appcompattheme/DarkAppCompatActivity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.chrisbanes.accompanist.appcompattheme
+package com.google.accompanist.appcompattheme
 
 import android.content.Context
 import androidx.appcompat.app.AppCompatActivity

appcompat-theme/src/androidTest/java/dev/chrisbanes/accompanist/appcompattheme/LightAppCompatActivity.kt → appcompat-theme/src/androidTest/java/com/google/accompanist/appcompattheme/LightAppCompatActivity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.chrisbanes.accompanist.appcompattheme
+package com.google.accompanist.appcompattheme
 
 import android.content.Context
 import androidx.appcompat.app.AppCompatActivity

appcompat-theme/src/androidTest/java/dev/chrisbanes/accompanist/appcompattheme/NotAppCompatActivity.kt → appcompat-theme/src/androidTest/java/com/google/accompanist/appcompattheme/NotAppCompatActivity.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.chrisbanes.accompanist.appcompattheme
+package com.google.accompanist.appcompattheme
 
 import androidx.activity.ComponentActivity
 

appcompat-theme/src/androidTest/java/dev/chrisbanes/accompanist/appcompattheme/NotAppCompatThemeTest.kt → appcompat-theme/src/androidTest/java/com/google/accompanist/appcompattheme/NotAppCompatThemeTest.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.chrisbanes.accompanist.appcompattheme
+package com.google.accompanist.appcompattheme
 
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.test.filters.MediumTest

appcompat-theme/src/main/AndroidManifest.xml

@@ -14,5 +14,5 @@
   ~ limitations under the License.
   -->
 
-<manifest package="dev.chrisbanes.accompanist.appcompattheme">
+<manifest package="com.google.accompanist.appcompattheme">
 </manifest>

appcompat-theme/src/main/java/dev/chrisbanes/accompanist/appcompattheme/AppCompatTheme.kt → appcompat-theme/src/main/java/com/google/accompanist/appcompattheme/AppCompatTheme.kt

@@ -16,7 +16,7 @@
 
 @file:JvmName("AppCompatTheme")
 
-package dev.chrisbanes.accompanist.appcompattheme
+package com.google.accompanist.appcompattheme
 
 import android.content.Context
 import androidx.compose.material.Colors

appcompat-theme/src/main/java/dev/chrisbanes/accompanist/appcompattheme/Color.kt → appcompat-theme/src/main/java/com/google/accompanist/appcompattheme/Color.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.chrisbanes.accompanist.appcompattheme
+package com.google.accompanist.appcompattheme
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb

appcompat-theme/src/main/java/dev/chrisbanes/accompanist/appcompattheme/TypedArrayUtils.kt → appcompat-theme/src/main/java/com/google/accompanist/appcompattheme/TypedArrayUtils.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.chrisbanes.accompanist.appcompattheme
+package com.google.accompanist.appcompattheme
 
 import android.annotation.SuppressLint
 import android.content.res.Resources

build.gradle

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import dev.chrisbanes.accompanist.buildsrc.Libs
-import dev.chrisbanes.accompanist.buildsrc.Versions
+import com.google.accompanist.buildsrc.Libs
+import com.google.accompanist.buildsrc.Versions
 
 buildscript {
     repositories {

buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt → buildSrc/src/main/java/com/google/accompanist/buildsrc/dependencies.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.chrisbanes.accompanist.buildsrc
+package com.google.accompanist.buildsrc
 
 object Versions {
     const val ktlint = "0.40.0"

coil/README.md

@@ -1,6 +1,6 @@
 # Coil for Jetpack Compose
 
-[![Maven Central](https://img.shields.io/maven-central/v/dev.chrisbanes.accompanist/accompanist-coil)](https://search.maven.org/search?q=g:dev.chrisbanes.accompanist)
+[![Maven Central](https://img.shields.io/maven-central/v/com.google.accompanist/accompanist-coil)](https://search.maven.org/search?q=g:com.google.accompanist)
 
 This library brings easy-to-use composable which can fetch and display images from external sources, such as network, using the [Coil][coil] image loading library.
 
@@ -122,15 +122,15 @@ For more information on composition locals, see [here](https://developer.android
 
 ## Download
 
-[![Maven Central](https://img.shields.io/maven-central/v/dev.chrisbanes.accompanist/accompanist-coil)](https://search.maven.org/search?q=g:dev.chrisbanes.accompanist)
+[![Maven Central](https://img.shields.io/maven-central/v/com.google.accompanist/accompanist-coil)](https://search.maven.org/search?q=g:com.google.accompanist)
 
 ```groovy
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation "dev.chrisbanes.accompanist:accompanist-coil:<version>"
+    implementation "com.google.accompanist:accompanist-coil:<version>"
 }
 ```
 
@@ -141,5 +141,5 @@ Snapshots of the development version are available in [Sonatype's `snapshots` re
 Eventually the goal is to upstream all of this functionality back to [Coil][coil]. [Jetpack Compose][compose]'s development is currently moving very fast, which means that there are frequent API changes between releases. For now, it makes sense to keep this as a seperately released library to track the latest Compose release.
 
 [compose]: https://developer.android.com/jetpack/compose
-[snap]: https://oss.sonatype.org/content/repositories/snapshots/dev/chrisbanes/accompanist/accompanist-coil/
+[snap]: https://oss.sonatype.org/content/repositories/snapshots/com/google/accompanist/accompanist-coil/
 [coil]: https://github.com/coil-kt/coil

coil/api/coil.api

@@ -1,14 +1,14 @@
-public final class dev/chrisbanes/accompanist/coil/CoilImage {
+public final class com/google/accompanist/coil/CoilImage {
 	public static final fun CoilImage (Lcoil/request/ImageRequest;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V
 	public static final fun CoilImage (Lcoil/request/ImageRequest;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/ui/graphics/ColorFilter;ZLkotlin/jvm/functions/Function2;Lcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;III)V
 	public static final fun CoilImage (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V
 	public static final fun CoilImage (Ljava/lang/Object;Ljava/lang/String;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/ui/graphics/ColorFilter;ZLkotlin/jvm/functions/Function2;Lcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;III)V
 	public static final fun getLocalImageLoader ()Landroidx/compose/runtime/ProvidableCompositionLocal;
 }
 
-public final class dev/chrisbanes/accompanist/coil/CoilImageDefaults {
+public final class com/google/accompanist/coil/CoilImageDefaults {
 	public static final field $stable I
-	public static final field INSTANCE Ldev/chrisbanes/accompanist/coil/CoilImageDefaults;
+	public static final field INSTANCE Lcom/google/accompanist/coil/CoilImageDefaults;
 	public final fun defaultImageLoader (Landroidx/compose/runtime/Composer;I)Lcoil/ImageLoader;
 }
 

coil/build.gradle

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import dev.chrisbanes.accompanist.buildsrc.Libs
+import com.google.accompanist.buildsrc.Libs
 
 plugins {
     id 'com.android.library'

coil/src/androidTest/AndroidManifest.xml

@@ -15,7 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.chrisbanes.accompanist.coil.test">
+    package="com.google.accompanist.coil.test">
 
     <uses-sdk android:targetSdkVersion="30" />
 

coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt → coil/src/androidTest/java/com/google/accompanist/coil/CoilTest.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.chrisbanes.accompanist.coil
+package com.google.accompanist.coil
 
 import android.graphics.drawable.ShapeDrawable
 import androidx.compose.foundation.Image
@@ -50,13 +50,13 @@ import coil.decode.Options
 import coil.fetch.Fetcher
 import coil.request.CachePolicy
 import coil.request.ImageRequest
+import com.google.accompanist.coil.test.R
+import com.google.accompanist.imageloading.ImageLoadState
+import com.google.accompanist.imageloading.test.ImageMockWebServer
+import com.google.accompanist.imageloading.test.assertPixels
+import com.google.accompanist.imageloading.test.receiveBlocking
+import com.google.accompanist.imageloading.test.resourceUri
 import com.google.common.truth.Truth.assertThat
-import dev.chrisbanes.accompanist.coil.test.R
-import dev.chrisbanes.accompanist.imageloading.ImageLoadState
-import dev.chrisbanes.accompanist.imageloading.test.ImageMockWebServer
-import dev.chrisbanes.accompanist.imageloading.test.assertPixels
-import dev.chrisbanes.accompanist.imageloading.test.receiveBlocking
-import dev.chrisbanes.accompanist.imageloading.test.resourceUri
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.runBlocking

coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTestTags.kt → coil/src/androidTest/java/com/google/accompanist/coil/CoilTestTags.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.chrisbanes.accompanist.coil
+package com.google.accompanist.coil
 
 object CoilTestTags {
     const val Image = "image"

coil/src/main/AndroidManifest.xml

@@ -14,5 +14,5 @@
   ~ limitations under the License.
   -->
 
-<manifest package="dev.chrisbanes.accompanist.coil">
+<manifest package="com.google.accompanist.coil">
 </manifest>

coil/src/main/java/dev/chrisbanes/accompanist/coil/Coil.kt → coil/src/main/java/com/google/accompanist/coil/Coil.kt

@@ -17,7 +17,7 @@
 @file:JvmName("CoilImage")
 @file:JvmMultifileClass
 
-package dev.chrisbanes.accompanist.coil
+package com.google.accompanist.coil
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.BoxScope
@@ -38,13 +38,13 @@ import coil.ImageLoader
 import coil.imageLoader
 import coil.request.ImageRequest
 import coil.request.ImageResult
-import dev.chrisbanes.accompanist.imageloading.DataSource
-import dev.chrisbanes.accompanist.imageloading.DefaultRefetchOnSizeChangeLambda
-import dev.chrisbanes.accompanist.imageloading.EmptyRequestCompleteLambda
-import dev.chrisbanes.accompanist.imageloading.ImageLoad
-import dev.chrisbanes.accompanist.imageloading.ImageLoadState
-import dev.chrisbanes.accompanist.imageloading.MaterialLoadingImage
-import dev.chrisbanes.accompanist.imageloading.toPainter
+import com.google.accompanist.imageloading.DataSource
+import com.google.accompanist.imageloading.DefaultRefetchOnSizeChangeLambda
+import com.google.accompanist.imageloading.EmptyRequestCompleteLambda
+import com.google.accompanist.imageloading.ImageLoad
+import com.google.accompanist.imageloading.ImageLoadState
+import com.google.accompanist.imageloading.MaterialLoadingImage
+import com.google.accompanist.imageloading.toPainter
 
 /**
  * Composition local containing the preferred [ImageLoader] to use in [CoilImage].

docs/appcompat-theme.md

@@ -130,7 +130,7 @@ repositories {
 }
 
 dependencies {
-    implementation "dev.chrisbanes.accompanist:accompanist-appcompat-theme:<version>"
+    implementation "com.google.accompanist:accompanist-appcompat-theme:<version>"
 }
 ```
 
@@ -165,8 +165,8 @@ limitations under the License.
 
  [compose]: https://developer.android.com/jetpack/compose
  [appcompat]: https://developer.android.com/jetpack/androidx/releases/appcompat
- [appcompatheme]: https://google.github.io/accompanist/api/appcompat-theme/appcompat-theme/dev.chrisbanes.accompanist.appcompattheme/-app-compat-theme.html
- [createappcompattheme]: https://google.github.io/accompanist/api/appcompat-theme/appcompat-theme/dev.chrisbanes.accompanist.appcompattheme/create-app-compat-theme.html
+ [appcompatheme]: https://google.github.io/accompanist/api/appcompat-theme/appcompat-theme/com.google.accompanist.appcompattheme/-app-compat-theme.html
+ [createappcompattheme]: https://google.github.io/accompanist/api/appcompat-theme/appcompat-theme/com.google.accompanist.appcompattheme/create-app-compat-theme.html
  [materialtheme]: https://developer.android.com/reference/kotlin/androidx/compose/material/MaterialTheme
  [shapes]: https://developer.android.com/reference/kotlin/androidx/compose/material/Shapes
  [colors]: https://developer.android.com/reference/kotlin/androidx/compose/material/Colors

docs/flowlayout.md

@@ -1,6 +1,6 @@
 # Jetpack Compose Flow Layouts
 
-[![Maven Central](https://img.shields.io/maven-central/v/dev.chrisbanes.accompanist/accompanist-flowlayout)](https://search.maven.org/search?q=g:dev.chrisbanes.accompanist)
+[![Maven Central](https://img.shields.io/maven-central/v/com.google.accompanist/accompanist-flowlayout)](https://search.maven.org/search?q=g:com.google.accompanist)
 
 Flow layouts adapted from the [Jetpack Compose][compose] alpha versions.
 
@@ -18,7 +18,7 @@ FlowColumn {
 }
 ```
 
-For examples, refer to the [samples](https://github.com/chrisbanes/accompanist/tree/main/sample/src/main/java/dev/chrisbanes/accompanist/sample/flowlayout).
+For examples, refer to the [samples](https://github.com/google/accompanist/tree/main/sample/src/main/java/com/google/accompanist/sample/flowlayout).
 
 For more information, visit the documentation: https://google.github.io/accompanist/flowlayout
 
@@ -30,11 +30,11 @@ repositories {
 }
 
 dependencies {
-    implementation "dev.chrisbanes.accompanist:accompanist-flowlayout:<version>"
+    implementation "com.google.accompanist:accompanist-flowlayout:<version>"
 }
 ```
 
 Snapshots of the development version are available in [Sonatype's `snapshots` repository][snap]. These are updated on every commit.
 
 [compose]: https://developer.android.com/jetpack/compose
-[snap]: https://oss.sonatype.org/content/repositories/snapshots/dev/chrisbanes/accompanist/accompanist-flowlayout/
+[snap]: https://oss.sonatype.org/content/repositories/snapshots/com/google/accompanist/accompanist-flowlayout/