Skip to content

Commit 6734462

Browse files
update gradle files
1 parent ca8fc52 commit 6734462

File tree

75 files changed

+330
-280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+330
-280
lines changed

External-Tutorial-Navigation-Codelab/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ android {
4646
productFlavors {
4747
}
4848

49-
lintOptions {
50-
abortOnError false
51-
}
5249

5350
compileOptions {
5451
sourceCompatibility = 1.8
@@ -58,6 +55,10 @@ android {
5855
kotlinOptions {
5956
jvmTarget = "1.8"
6057
}
58+
namespace 'com.example.android.codelabs.navigation'
59+
lint {
60+
abortOnError false
61+
}
6162

6263
}
6364

External-Tutorial-Navigation-Codelab/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
xmlns:tools="http://schemas.android.com/tools"
19-
package="com.example.android.codelabs.navigation">
18+
xmlns:tools="http://schemas.android.com/tools">
2019

2120
<application
2221
android:allowBackup="false"

External-Tutorial-NavigationAdvancedSample/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ android {
3535
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3636
}
3737
}
38+
namespace 'com.example.android.navigationadvancedsample'
3839
}
3940

4041
dependencies {

External-Tutorial-NavigationAdvancedSample/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
-->
1717

1818
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
19-
xmlns:tools="http://schemas.android.com/tools"
20-
package="com.example.android.navigationadvancedsample">
19+
xmlns:tools="http://schemas.android.com/tools">
2120

2221
<application
2322
android:allowBackup="true"

External-Tutorial-NavigationBasicSample/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
apply plugin: 'com.android.application'
1818
apply plugin: 'kotlin-android'
1919
apply plugin: 'kotlin-kapt'
20-
apply plugin: 'kotlin-android-extensions'
20+
2121

2222
android {
2323
compileSdkVersion rootProject.compileSdkVersion
@@ -56,6 +56,7 @@ android {
5656
java.srcDirs += "src/uiTest/java"
5757
}
5858
}
59+
namespace 'com.example.android.navigationsample'
5960
}
6061

6162
dependencies {

External-Tutorial-NavigationBasicSample/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717

18-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
19-
package="com.example.android.navigationsample">
18+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2019

2120
<application
2221
android:allowBackup="true"

Tutorial0-0MaterialDesign/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
3+
44
apply plugin: 'kotlin-kapt'
55

66
android {
@@ -39,6 +39,7 @@ android {
3939
dataBinding {
4040
enabled = true
4141
}
42+
namespace 'com.smarttoolfactory.tutorial0_materialdesign'
4243

4344

4445
}

Tutorial0-0MaterialDesign/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.smarttoolfactory.tutorial0_materialdesign">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"

Tutorial0-1ViewPager2-NestedChildFragment/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
3+
44
apply plugin: 'kotlin-kapt'
55

66
android {
@@ -36,6 +36,7 @@ android {
3636
dataBinding {
3737
enabled = true
3838
}
39+
namespace 'com.smarttoolfactory.tutorial0_1viewpager2'
3940

4041
}
4142

Tutorial0-1ViewPager2-NestedChildFragment/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.smarttoolfactory.tutorial0_1viewpager2">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"

0 commit comments

Comments
 (0)