Skip to content
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

Convert to namespace #1444

Merged
merged 1 commit into from
Dec 11, 2022
Merged

Convert to namespace #1444

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
2 changes: 2 additions & 0 deletions adaptive/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.adaptive"

compileSdkVersion 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions adaptive/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
~ limitations under the License.
-->

<manifest package="com.google.accompanist.adaptive">
</manifest>
<manifest />
2 changes: 2 additions & 0 deletions appcompat-theme/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.appcompattheme"

compileSdkVersion 33

defaultConfig {
Expand Down
9 changes: 4 additions & 5 deletions appcompat-theme/src/androidTest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,22 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.appcompattheme">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />

<application>
<activity
android:name=".LightAppCompatActivity"
android:name="com.google.accompanist.appcompattheme.LightAppCompatActivity"
android:exported="true"
android:theme="@style/Theme.AppCompatThemeTest" />

<activity
android:name=".DarkAppCompatActivity"
android:name="com.google.accompanist.appcompattheme.DarkAppCompatActivity"
android:exported="true"
android:theme="@style/Theme.AppCompatThemeTest" />

<activity
android:name=".NotAppCompatActivity"
android:name="com.google.accompanist.appcompattheme.NotAppCompatActivity"
android:exported="true"
android:theme="@android:style/Theme.Material" />
</application>
Expand Down
3 changes: 1 addition & 2 deletions appcompat-theme/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.appcompattheme">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
9 changes: 4 additions & 5 deletions appcompat-theme/src/test/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,21 @@
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.accompanist.appcompattheme">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application>
<activity
android:name=".LightAppCompatActivity"
android:name="com.google.accompanist.appcompattheme.LightAppCompatActivity"
android:exported="true"
android:theme="@style/Theme.AppCompatThemeTest" />

<activity
android:name=".DarkAppCompatActivity"
android:name="com.google.accompanist.appcompattheme.DarkAppCompatActivity"
android:exported="true"
android:theme="@style/Theme.AppCompatThemeTest" />

<activity
android:name=".NotAppCompatActivity"
android:name="com.google.accompanist.appcompattheme.NotAppCompatActivity"
android:exported="true"
android:theme="@android:style/Theme.Material" />
</application>
Expand Down
2 changes: 2 additions & 0 deletions drawablepainter/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.drawablepainter"

compileSdkVersion 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions drawablepainter/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.drawablepainter">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
2 changes: 2 additions & 0 deletions flowlayout/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.flowlayout"

compileSdkVersion 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions flowlayout/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.flowlayout">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
2 changes: 2 additions & 0 deletions insets-ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.insets.ui"

compileSdkVersion 33

defaultConfig {
Expand Down
4 changes: 1 addition & 3 deletions insets-ui/src/androidTest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.insets.test">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-sdk android:targetSdkVersion="30" />

Expand Down
3 changes: 1 addition & 2 deletions insets-ui/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.insets.ui">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
2 changes: 2 additions & 0 deletions insets/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.insets"

compileSdkVersion 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions insets/src/androidTest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.accompanist.insets.test">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application>
<activity
Expand Down
3 changes: 1 addition & 2 deletions insets/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.insets">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
3 changes: 1 addition & 2 deletions insets/src/test/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.accompanist.insets.test">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application>
<activity
Expand Down
2 changes: 2 additions & 0 deletions internal-testutils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ plugins {
}

android {
namespace "com.google.accompanist.internal.test"

compileSdkVersion 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions internal-testutils/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.accompanist.internal.test">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application android:theme="@style/Theme.Test" />

Expand Down
2 changes: 2 additions & 0 deletions navigation-animation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.navigation.animation"

compileSdkVersion 33

defaultConfig {
Expand Down
18 changes: 0 additions & 18 deletions navigation-animation/src/androidTest/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions navigation-animation/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.navigation.animation">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
2 changes: 2 additions & 0 deletions navigation-material/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.navigation.material"

compileSdkVersion 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions navigation-material/src/androidTest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
~ limitations under the License.
-->

<manifest package="com.google.accompanist.navigation.material.test">
</manifest>
<manifest />
3 changes: 1 addition & 2 deletions navigation-material/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.navigation.material">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
2 changes: 2 additions & 0 deletions pager-indicators/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.pager.indicators"

compileSdkVersion 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions pager-indicators/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.pager.indicators">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
2 changes: 2 additions & 0 deletions pager/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.pager"

compileSdkVersion 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions pager/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.pager">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
2 changes: 2 additions & 0 deletions permissions/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.permissions"

compileSdkVersion 33

defaultConfig {
Expand Down
7 changes: 3 additions & 4 deletions permissions/src/androidTest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,18 @@
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.accompanist.permissions.test">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

<application>
<activity
android:name=".PermissionsTestActivity"
android:name="com.google.accompanist.permissions.test.PermissionsTestActivity"
android:exported="true"
android:theme="@android:style/Theme.Material.NoActionBar" />
<activity
android:name=".EmptyPermissionsTestActivity"
android:name="com.google.accompanist.permissions.test.EmptyPermissionsTestActivity"
android:exported="true"
android:theme="@android:style/Theme.Material.NoActionBar" />
</application>
Expand Down
3 changes: 1 addition & 2 deletions permissions/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.permissions">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
2 changes: 2 additions & 0 deletions placeholder-material/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ kotlin {
}

android {
namespace "com.google.accompanist.placeholder.material"

compileSdkVersion 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions placeholder-material/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.placeholder.material">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
1 change: 1 addition & 0 deletions placeholder/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ android {
res.srcDirs += 'src/sharedTest/res'
}
}
namespace 'com.google.accompanist.placeholder'
}

dependencies {
Expand Down
3 changes: 1 addition & 2 deletions placeholder/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.google.accompanist.placeholder">
xmlns:tools="http://schemas.android.com/tools">
<uses-sdk android:minSdkVersion="21" tools:ignore="GradleOverrides" />
</manifest>
1 change: 1 addition & 0 deletions sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ android {
composeOptions {
kotlinCompilerExtensionVersion libs.versions.composeCompiler.get()
}
namespace 'com.google.accompanist.sample'
}

dependencies {
Expand Down
Loading