Maintenance release

* Update build tools version
* Log errors
* Package rename

Author: keyboardsurfer

app/build.gradle

@@ -23,7 +23,7 @@ android {
     buildToolsVersion '28.0.0-rc1'
 
     defaultConfig {
-        applicationId "com.google.android.samples.dynamicapps.ondemand"
+        applicationId "com.google.android.samples.dynamicfeatures.ondemand"
         minSdkVersion 21
         targetSdkVersion 27
         versionCode 1

app/bundle.aab

@@ -16,7 +16,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.samples.dynamicapps">
+    package="com.google.android.samples.dynamicfeatures">
 
     <application android:name="com.google.android.play.core.splitcompat.SplitCompatApplication"
         android:allowBackup="true"
@@ -25,7 +25,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name="com.google.android.samples.dynamicfeatures.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />

app/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.samples.dynamicapps
+package com.google.android.samples.dynamicfeatures
 
 import android.content.Context
 import android.content.Intent
@@ -35,7 +35,7 @@ import com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListene
 import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus
 
 
-private const val packageName = "com.google.android.samples.dynamicapps.ondemand"
+private const val packageName = "com.google.android.samples.dynamicfeatures.ondemand"
 
 private const val kotlinSampleClassname = "$packageName.KotlinSampleActivity"
 
@@ -70,6 +70,9 @@ class MainActivity : AppCompatActivity() {
                 }
 
                 SplitInstallSessionStatus.INSTALLING -> displayLoadingState(state, "Installing $name")
+                SplitInstallSessionStatus.FAILED -> {
+                    Log.e(TAG, "Error: ${state.errorCode()} for module ${state.moduleNames()}")
+                }
             }
         }
     }
@@ -282,5 +285,7 @@ class MainActivity : AppCompatActivity() {
 
 fun Context.toastAndLog(text: String) {
     Toast.makeText(this, text, Toast.LENGTH_LONG).show()
-    Log.d("DynamicFeatures", text)
-}
+    Log.d(TAG, text)
+}
+
+private const val TAG = "DynamicFeatures"

app/src/main/java/com/google/android/samples/dynamicapps/MainActivity.kt renamed to app/src/main/java/com/google/android/samples/dynamicfeatures/MainActivity.kt

@@ -23,7 +23,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-alpha14'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

build.gradle

@@ -18,7 +18,7 @@
 <!-- This feature module only contains a single assets file relevant to the Android app. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:dist="http://schemas.android.com/apk/distribution"
-    package="com.google.android.samples.dynamicapps.ondemand"
+    package="com.google.android.samples.dynamicfeatures.ondemand"
     split="assets">
 
     <dist:module

features/assets/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:dist="http://schemas.android.com/apk/distribution"
-    package="com.google.android.samples.dynamicapps.ondemand"
+    package="com.google.android.samples.dynamicfeatures.ondemand"
     split="java">
 
     <dist:module
@@ -27,7 +27,7 @@
     </dist:module>
 
     <application>
-        <activity android:name=".JavaSampleActivity">
+        <activity android:name="com.google.android.samples.dynamicfeatures.ondemand.JavaSampleActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>

features/java/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.samples.dynamicapps.ondemand;
+package com.google.android.samples.dynamicfeatures.ondemand;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;

features/java/src/main/java/com/google/android/samples/dynamicapps/ondemand/JavaSampleActivity.java renamed to features/java/src/main/java/com/google/android/samples/dynamicfeatures/ondemand/JavaSampleActivity.java

@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:dist="http://schemas.android.com/apk/distribution"
-    package="com.google.android.samples.dynamicapps.ondemand"
+    package="com.google.android.samples.dynamicfeatures.ondemand"
     split="kotlin">
 
     <dist:module
@@ -27,7 +27,7 @@
     </dist:module>
 
     <application>
-        <activity android:name=".KotlinSampleActivity">
+        <activity android:name="com.google.android.samples.dynamicfeatures.ondemand.KotlinSampleActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>

features/kotlin/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.samples.dynamicapps.ondemand
+package com.google.android.samples.dynamicfeatures.ondemand
 
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity

features/kotlin/src/main/java/com/google/android/samples/dynamicapps/ondemand/KotlinSampleActivity.kt renamed to features/kotlin/src/main/java/com/google/android/samples/dynamicfeatures/ondemand/KotlinSampleActivity.kt

@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:dist="http://schemas.android.com/apk/distribution"
-    package="com.google.android.samples.dynamicapps.ondemand"
+    package="com.google.android.samples.dynamicfeatures.ondemand"
     split="native">
 
     <dist:module
@@ -27,7 +27,7 @@
     </dist:module>
 
     <application>
-        <activity android:name=".NativeSampleActivity">
+        <activity android:name="com.google.android.samples.dynamicfeatures.ondemand.NativeSampleActivity">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>

features/native/src/main/AndroidManifest.xml

@@ -24,7 +24,7 @@
  *   app/src/main/java/com/example/kotlin/KotlinJni.kt
  */
 JNIEXPORT jstring JNICALL
-Java_com_google_android_samples_dynamicapps_ondemand_NativeSampleActivity_stringFromJNI( JNIEnv* env,
+Java_com_google_android_samples_dynamicfeatures_ondemand_NativeSampleActivity_stringFromJNI( JNIEnv* env,
                                                     jobject thiz )
 {
 #if defined(__arm__)

features/native/src/main/cpp/hello-jni.c

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.samples.dynamicapps.ondemand
+package com.google.android.samples.dynamicfeatures.ondemand
 
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle