Skip to content

Commit 4e96ba7

Browse files
committed
Update Kotlin and AGP versions
1 parent 1b82b0b commit 4e96ba7

File tree

195 files changed

+1683
-863
lines changed

Some content is hidden

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

195 files changed

+1683
-863
lines changed

animations/canvas/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ plugins {
77
id("common-compose-module-configs-script-plugin")
88
}
99

10+
android {
11+
namespace = "com.guru.composecookbook.canvas"
12+
}
13+
1014
dependencies {
1115
implementation(project(":theme"))
1216
addComposeOfficialDependencies()
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.guru.composecookbook.canvas">
2+
<manifest>
33

44
</manifest>

animations/lottie/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ plugins {
99
id("common-compose-module-configs-script-plugin")
1010
}
1111

12+
android {
13+
namespace = "com.guru.composecookbook.lottie"
14+
}
15+
1216
dependencies {
1317
addComposeOfficialDependencies()
1418
addCoreAndroidDependencies()
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.guru.composecookbook.lottie">
2+
<manifest>
33

44
</manifest>

app/build.gradle.kts

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
import com.guru.composecookbook.build.configurations.ProjectConfigs
2-
import com.guru.composecookbook.build.dependencies.*
2+
import com.guru.composecookbook.build.dependencies.addAndroidInstrumentationTestsDependencies
3+
import com.guru.composecookbook.build.dependencies.addBiometricDependency
4+
import com.guru.composecookbook.build.dependencies.addComposeDebugDependencies
5+
import com.guru.composecookbook.build.dependencies.addComposeOfficialDependencies
6+
import com.guru.composecookbook.build.dependencies.addComposeThirdPartyDependencies
7+
import com.guru.composecookbook.build.dependencies.addCoreAndroidDependencies
8+
import com.guru.composecookbook.build.dependencies.addCoreAndroidUiDependencies
9+
import com.guru.composecookbook.build.dependencies.addDataDependencies
10+
import com.guru.composecookbook.build.dependencies.addGoogleAndroidDependencies
11+
import com.guru.composecookbook.build.dependencies.addJunit5TestDependencies
12+
import com.guru.composecookbook.build.dependencies.addKotlinDependencies
13+
import com.guru.composecookbook.build.dependencies.addKotlinTestDependencies
14+
import com.guru.composecookbook.build.dependencies.addNetworkingDependencies
15+
import com.guru.composecookbook.build.dependencies.addThirdPartyUiDependencies
16+
import com.guru.composecookbook.build.dependencies.addThirdPartyUnitTestsDependencies
317

418
plugins {
519
id("com.android.application")
@@ -10,6 +24,7 @@ plugins {
1024
android {
1125

1226
compileSdk = ProjectConfigs.compileSdkVersion
27+
namespace = ProjectConfigs.applicationId
1328

1429
defaultConfig {
1530
applicationId = ProjectConfigs.applicationId
@@ -52,12 +67,6 @@ android {
5267
lint {
5368
abortOnError = false
5469
}
55-
packagingOptions {
56-
resources.excludes.apply {
57-
add("META-INF/AL2.0")
58-
add("META-INF/LGPL2.1")
59-
}
60-
}
6170
testOptions {
6271
unitTests.all {
6372
it.useJUnitPlatform()

app/src/androidTest/java/com/guru/composecookbook/BottomNavigationBarTests.kt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
package com.guru.composecookbook
22

3-
import androidx.compose.ui.test.*
3+
import androidx.compose.ui.test.ExperimentalTestApi
4+
import androidx.compose.ui.test.assertAny
5+
import androidx.compose.ui.test.assertCountEquals
6+
import androidx.compose.ui.test.assertIsDisplayed
7+
import androidx.compose.ui.test.assertIsSelectable
8+
import androidx.compose.ui.test.assertIsSelected
9+
import androidx.compose.ui.test.isNotSelected
410
import androidx.compose.ui.test.junit4.createAndroidComposeRule
11+
import androidx.compose.ui.test.onChild
12+
import androidx.compose.ui.test.onChildren
13+
import androidx.compose.ui.test.onNodeWithTag
14+
import androidx.compose.ui.test.onSiblings
15+
import androidx.compose.ui.test.performClick
516
import com.guru.composecookbook.ui.utils.TestTags
617
import org.junit.Rule
718
import org.junit.Test

app/src/androidTest/java/com/guru/composecookbook/ui/home/home_screen_options/flings/FlingSettingsPageTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.guru.composecookbook.ui.utils.TestTags
1010
import org.junit.Assert
1111
import org.junit.Rule
1212
import org.junit.Test
13-
import java.util.*
13+
import java.util.Locale
1414

1515
/**
1616
*

app/src/main/java/com/guru/composecookbook/MainActivity.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.guru.composecookbook
22

3-
import FaIcons
43
import android.content.res.Configuration.ORIENTATION_PORTRAIT
54
import android.os.Bundle
65
import androidx.activity.ComponentActivity
@@ -11,8 +10,6 @@ import androidx.compose.foundation.ExperimentalFoundationApi
1110
import androidx.compose.foundation.layout.Column
1211
import androidx.compose.foundation.layout.Row
1312
import androidx.compose.foundation.layout.fillMaxSize
14-
import androidx.compose.material.BottomNavigation
15-
import androidx.compose.material.BottomNavigationItem
1613
import androidx.compose.material.ExperimentalMaterialApi
1714
import androidx.compose.material.LocalContentAlpha
1815
import androidx.compose.material.ModalBottomSheetLayout
@@ -29,7 +26,6 @@ import androidx.compose.material3.NavigationRail
2926
import androidx.compose.material3.NavigationRailItem
3027
import androidx.compose.material3.Surface
3128
import androidx.compose.material3.Text
32-
import androidx.compose.material3.contentColorFor
3329
import androidx.compose.runtime.Composable
3430
import androidx.compose.runtime.MutableState
3531
import androidx.compose.runtime.getValue
@@ -66,6 +62,7 @@ import com.guru.composecookbook.ui.templates.TemplateScreen
6662
import com.guru.composecookbook.ui.utils.RotateIcon
6763
import com.guru.composecookbook.ui.utils.TestTags
6864
import com.guru.fontawesomecomposelib.FaIcon
65+
import com.guru.fontawesomecomposelib.FaIcons
6966
import kotlinx.coroutines.launch
7067

7168
class MainActivity : ComponentActivity() {

app/src/main/java/com/guru/composecookbook/ui/animation/AnimateAsStateAnimations.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import androidx.compose.foundation.layout.offset
2020
import androidx.compose.foundation.layout.padding
2121
import androidx.compose.foundation.layout.size
2222
import androidx.compose.foundation.layout.width
23+
import androidx.compose.material.Divider
2324
import androidx.compose.material3.Button
2425
import androidx.compose.material3.ButtonDefaults
25-
import androidx.compose.material.Divider
2626
import androidx.compose.material3.MaterialTheme
2727
import androidx.compose.material3.Text
2828
import androidx.compose.runtime.Composable
@@ -38,7 +38,7 @@ import androidx.compose.ui.graphics.graphicsLayer
3838
import androidx.compose.ui.res.painterResource
3939
import androidx.compose.ui.unit.Dp
4040
import androidx.compose.ui.unit.dp
41-
import com.guru.composecookbook.R
41+
import com.guru.composecookbook.data.R
4242
import com.guru.composecookbook.ui.utils.SubtitleText
4343
import com.guru.composecookbook.ui.utils.TitleText
4444

app/src/main/java/com/guru/composecookbook/ui/animation/AnimationScreen.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@ import androidx.compose.foundation.layout.Spacer
44
import androidx.compose.foundation.layout.padding
55
import androidx.compose.foundation.lazy.LazyColumn
66
import androidx.compose.foundation.lazy.rememberLazyListState
7-
import androidx.compose.material3.IconButton
8-
import androidx.compose.material3.Scaffold
9-
import androidx.compose.material3.Text
107
import androidx.compose.material.icons.Icons
118
import androidx.compose.material.icons.filled.PlayArrow
129
import androidx.compose.material3.ExperimentalMaterial3Api
10+
import androidx.compose.material3.IconButton
11+
import androidx.compose.material3.Scaffold
1312
import androidx.compose.material3.SmallTopAppBar
14-
import androidx.compose.runtime.*
13+
import androidx.compose.material3.Text
14+
import androidx.compose.runtime.Composable
15+
import androidx.compose.runtime.getValue
16+
import androidx.compose.runtime.mutableStateOf
17+
import androidx.compose.runtime.remember
18+
import androidx.compose.runtime.setValue
1519
import androidx.compose.ui.Alignment
1620
import androidx.compose.ui.Modifier
1721
import androidx.compose.ui.platform.testTag

0 commit comments

Comments
 (0)