Merge pull request #925 from Iterable/MOB-11526-SampleApp-Maintenance

[MOB-11526] - Gradle upgrade for sample apps

Author: Ayyanchira

sample-apps/inbox-customization/app/build.gradle

@@ -2,10 +2,9 @@ apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
 
-apply plugin: 'kotlin-android-extensions'
-
 android {
-    compileSdkVersion 34
+    namespace "com.iterable.inbox_customization"
+    compileSdk 34
     buildToolsVersion "33.0.2"
     defaultConfig {
         applicationId "com.iterable.inbox_customization"
@@ -21,23 +20,33 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core-ktx:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.6.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.6.0'
+    implementation 'com.google.android.material:material:1.9.0'
 
     implementation 'com.iterable:iterableapi:3.5.14'
     implementation 'com.iterable:iterableapi-ui:3.5.14'
     implementation 'com.squareup.okhttp3:mockwebserver:4.2.2'
 
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

sample-apps/inbox-customization/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.iterable.inbox_customization">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".SampleApplication"

sample-apps/inbox-customization/app/src/main/java/com/iterable/inbox_customization/MainActivity.kt

@@ -7,20 +7,23 @@ import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import com.iterable.iterableapi.IterableApi
 import com.iterable.iterableapi.IterableInAppManager
-import kotlinx.android.synthetic.main.activity_main.*
+import com.iterable.inbox_customization.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity(), IterableInAppManager.Listener {
 
+    private lateinit var binding: ActivityMainBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
         setupNavigation()
     }
 
     private fun setupNavigation() {
         val navController = Navigation.findNavController(this, R.id.mainNavigationFragment)
         setupActionBarWithNavController(navController)
-        bottomNavigationView.setupWithNavController(navController)
+        binding.bottomNavigationView.setupWithNavController(navController)
     }
 
     override fun onResume() {
@@ -40,8 +43,8 @@ class MainActivity : AppCompatActivity(), IterableInAppManager.Listener {
     }
 
     private fun updateNotificationBadge(value: Int) {
-        val simpleInboxBadge = bottomNavigationView.getOrCreateBadge(R.id.simpleInboxFragment)
-        val customInboxBadge = bottomNavigationView.getOrCreateBadge(R.id.customInboxFragment)
+        val simpleInboxBadge = binding.bottomNavigationView.getOrCreateBadge(R.id.simpleInboxFragment)
+        val customInboxBadge = binding.bottomNavigationView.getOrCreateBadge(R.id.customInboxFragment)
         simpleInboxBadge.number = value
         customInboxBadge.number = value
     }

sample-apps/inbox-customization/app/src/main/res/layout/dark_inbox_cell.xml

@@ -18,7 +18,7 @@
         android:layout_marginLeft="8dp"
         android:layout_marginTop="8dp"
         android:src="@drawable/unread_indicator"
-        android:tint="#F71113"
+        app:tint="#F71113"
         android:layout_alignParentStart="true"
         android:layout_marginStart="8dp" />
 

sample-apps/inbox-customization/build.gradle

@@ -1,14 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
-        jcenter()
-
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.10'
+        classpath 'com.android.tools.build:gradle:8.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,7 +17,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

sample-apps/inbox-customization/gradle.properties

@@ -19,3 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.nonTransitiveRClass=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

sample-apps/inbox-customization/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Feb 21 17:13:45 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip