Skip to content

Commit 1896e66

Browse files
runningcoderunningcode
authored
Faster spotless configuration (#924)
1 parent c50ea66 commit 1896e66

File tree

24 files changed

+599
-663
lines changed

24 files changed

+599
-663
lines changed

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ allprojects {
1515
if (name != rootProject.name) {
1616
kotlin {
1717
ktfmt(libs.versions.ktfmt.get()).googleStyle()
18-
targetExclude("**/generated/**")
18+
target("**/*.kt")
1919
}
2020
}
2121
kotlinGradle {
2222
ktfmt(libs.versions.ktfmt.get()).googleStyle()
23-
targetExclude("**/generated/**")
23+
target("**/*.kts")
2424
}
2525
}
2626
}

‎buildSrc/build.gradle.kts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
plugins {
2-
`kotlin-dsl`
3-
}
4-
repositories {
5-
mavenCentral()
6-
}
1+
plugins { `kotlin-dsl` }
2+
3+
repositories { mavenCentral() }

‎examples/android-instrumentation-sample/src/main/java/io/sentry/samples/instrumentation/SampleApp.kt‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@ import io.sentry.samples.instrumentation.data.TracksDatabase
88

99
class SampleApp : Application() {
1010

11-
companion object {
12-
lateinit var database: TracksDatabase
13-
private set
11+
companion object {
12+
lateinit var database: TracksDatabase
13+
private set
1414

15-
lateinit var analytics: SharedPreferences
16-
private set
17-
}
15+
lateinit var analytics: SharedPreferences
16+
private set
17+
}
1818

19-
override fun onCreate() {
20-
super.onCreate()
21-
database = Room.databaseBuilder(this, TracksDatabase::class.java, "tracks.db")
22-
.createFromAsset("tracks.db")
23-
.fallbackToDestructiveMigration()
24-
.build()
19+
override fun onCreate() {
20+
super.onCreate()
21+
database =
22+
Room.databaseBuilder(this, TracksDatabase::class.java, "tracks.db")
23+
.createFromAsset("tracks.db")
24+
.fallbackToDestructiveMigration()
25+
.build()
2526

26-
analytics = getSharedPreferences("analytics", Context.MODE_PRIVATE)
27-
}
27+
analytics = getSharedPreferences("analytics", Context.MODE_PRIVATE)
28+
}
2829
}

‎examples/android-instrumentation-sample/src/main/java/io/sentry/samples/instrumentation/data/Entities.kt‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,40 @@ import java.io.Serializable
88

99
@Entity(tableName = "Artist")
1010
data class Artist(
11-
@PrimaryKey @ColumnInfo(name = "ArtistId")
12-
val id: Long,
13-
@ColumnInfo(name = "Name") val name: String?,
11+
@PrimaryKey @ColumnInfo(name = "ArtistId") val id: Long,
12+
@ColumnInfo(name = "Name") val name: String?,
1413
)
1514

1615
@Entity(
17-
tableName = "Album",
18-
foreignKeys = [
19-
ForeignKey(
20-
entity = Artist::class,
21-
parentColumns = arrayOf("ArtistId"),
22-
childColumns = arrayOf("ArtistId")
23-
)
24-
]
16+
tableName = "Album",
17+
foreignKeys =
18+
[
19+
ForeignKey(
20+
entity = Artist::class,
21+
parentColumns = arrayOf("ArtistId"),
22+
childColumns = arrayOf("ArtistId"),
23+
)
24+
],
2525
)
2626
data class Album(
27-
@PrimaryKey @ColumnInfo(name = "AlbumId")
28-
val id: Long,
29-
@ColumnInfo(name = "Title") val title: String,
30-
@ColumnInfo(name = "ArtistId") val artistId: Long
27+
@PrimaryKey @ColumnInfo(name = "AlbumId") val id: Long,
28+
@ColumnInfo(name = "Title") val title: String,
29+
@ColumnInfo(name = "ArtistId") val artistId: Long,
3130
)
3231

3332
@Entity(
34-
tableName = "Track",
35-
foreignKeys = [
36-
ForeignKey(
37-
entity = Album::class,
38-
parentColumns = ["AlbumId"],
39-
childColumns = ["AlbumId"]
40-
)
41-
]
33+
tableName = "Track",
34+
foreignKeys =
35+
[ForeignKey(entity = Album::class, parentColumns = ["AlbumId"], childColumns = ["AlbumId"])],
4236
)
4337
data class Track(
44-
@PrimaryKey(autoGenerate = true) @ColumnInfo(name = "TrackId")
45-
val id: Long = 0,
46-
@ColumnInfo(name = "Name") val name: String,
47-
@ColumnInfo(name = "AlbumId") val albumId: Long?,
48-
@ColumnInfo(name = "Composer") val composer: String?,
49-
@ColumnInfo(name = "MediaTypeId") val mediaTypeId: Long?,
50-
@ColumnInfo(name = "GenreId") val genreId: Long?,
51-
@ColumnInfo(name = "Milliseconds") val millis: Long,
52-
@ColumnInfo(name = "Bytes") val bytes: Long?,
53-
@ColumnInfo(name = "UnitPrice") val price: Float
38+
@PrimaryKey(autoGenerate = true) @ColumnInfo(name = "TrackId") val id: Long = 0,
39+
@ColumnInfo(name = "Name") val name: String,
40+
@ColumnInfo(name = "AlbumId") val albumId: Long?,
41+
@ColumnInfo(name = "Composer") val composer: String?,
42+
@ColumnInfo(name = "MediaTypeId") val mediaTypeId: Long?,
43+
@ColumnInfo(name = "GenreId") val genreId: Long?,
44+
@ColumnInfo(name = "Milliseconds") val millis: Long,
45+
@ColumnInfo(name = "Bytes") val bytes: Long?,
46+
@ColumnInfo(name = "UnitPrice") val price: Float,
5447
) : Serializable

‎examples/android-instrumentation-sample/src/main/java/io/sentry/samples/instrumentation/data/TracksDao.kt‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,22 @@ import kotlinx.coroutines.flow.Flow
1212
@Dao
1313
abstract class TracksDao {
1414

15-
@Query("SELECT * FROM track ORDER BY TrackId DESC")
16-
abstract fun all(): Flow<List<Track>>
15+
@Query("SELECT * FROM track ORDER BY TrackId DESC") abstract fun all(): Flow<List<Track>>
1716

18-
@Query(
19-
"SELECT * FROM Track WHERE AlbumId = (SELECT AlbumId FROM Album WHERE ArtistId = " +
20-
"(SELECT ArtistId from Artist WHERE Name = :bandName))"
21-
)
22-
abstract fun allByArtist(bandName: String): List<Track>
17+
@Query(
18+
"SELECT * FROM Track WHERE AlbumId = (SELECT AlbumId FROM Album WHERE ArtistId = " +
19+
"(SELECT ArtistId from Artist WHERE Name = :bandName))"
20+
)
21+
abstract fun allByArtist(bandName: String): List<Track>
2322

24-
@Transaction
25-
@Query("SELECT COUNT(*) FROM Track")
26-
abstract suspend fun count(): Int
23+
@Transaction @Query("SELECT COUNT(*) FROM Track") abstract suspend fun count(): Int
2724

28-
@Insert(onConflict = OnConflictStrategy.REPLACE)
29-
abstract suspend fun insert(track: Track): Long
25+
@Insert(onConflict = OnConflictStrategy.REPLACE) abstract suspend fun insert(track: Track): Long
3026

31-
@Insert(onConflict = OnConflictStrategy.REPLACE)
32-
abstract suspend fun insertAll(vararg tracks: Track)
27+
@Insert(onConflict = OnConflictStrategy.REPLACE)
28+
abstract suspend fun insertAll(vararg tracks: Track)
3329

34-
@Update(onConflict = OnConflictStrategy.REPLACE)
35-
abstract suspend fun update(track: Track)
30+
@Update(onConflict = OnConflictStrategy.REPLACE) abstract suspend fun update(track: Track)
3631

37-
@Transaction
38-
@Delete
39-
abstract suspend fun delete(track: Track)
32+
@Transaction @Delete abstract suspend fun delete(track: Track)
4033
}

‎examples/android-instrumentation-sample/src/main/java/io/sentry/samples/instrumentation/data/TracksDatabase.kt‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@ import io.sentry.android.instrumentation.lib.data.Favorite
66
import io.sentry.android.instrumentation.lib.data.FavoritesDao
77

88
@Database(
9-
entities = [
10-
Artist::class,
11-
Album::class,
12-
Track::class,
13-
Favorite::class
14-
],
15-
version = 1,
16-
exportSchema = false
9+
entities = [Artist::class, Album::class, Track::class, Favorite::class],
10+
version = 1,
11+
exportSchema = false,
1712
)
1813
abstract class TracksDatabase : RoomDatabase() {
19-
abstract fun tracksDao(): TracksDao
20-
abstract fun favoritesDao(): FavoritesDao
14+
abstract fun tracksDao(): TracksDao
15+
16+
abstract fun favoritesDao(): FavoritesDao
2117
}

‎examples/android-instrumentation-sample/src/main/java/io/sentry/samples/instrumentation/network/TrackService.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import retrofit2.http.Path
99

1010
interface TrackService {
1111

12-
@GET("v3/{uuid}")
13-
suspend fun tracks(@Path("uuid") uuid: String): List<Track>
12+
@GET("v3/{uuid}") suspend fun tracks(@Path("uuid") uuid: String): List<Track>
1413

15-
companion object {
16-
private val retrofit = Retrofit.Builder()
17-
.baseUrl("https://run.mocky.io/")
18-
.addConverterFactory(GsonConverterFactory.create())
19-
.build()
14+
companion object {
15+
private val retrofit =
16+
Retrofit.Builder()
17+
.baseUrl("https://run.mocky.io/")
18+
.addConverterFactory(GsonConverterFactory.create())
19+
.build()
2020

21-
val instance = retrofit.create<TrackService>()
22-
}
21+
val instance = retrofit.create<TrackService>()
22+
}
2323
}

‎examples/android-instrumentation-sample/src/main/java/io/sentry/samples/instrumentation/ui/ComposeActivity.kt‎

Lines changed: 44 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -22,61 +22,53 @@ import androidx.navigation.compose.rememberNavController
2222

2323
class ComposeActivity : ComponentActivity() {
2424

25-
override fun onCreate(savedInstanceState: Bundle?) {
26-
super.onCreate(savedInstanceState)
27-
setContent {
28-
val navController = rememberNavController()
25+
override fun onCreate(savedInstanceState: Bundle?) {
26+
super.onCreate(savedInstanceState)
27+
setContent {
28+
val navController = rememberNavController()
2929

30-
NavHost(
31-
navController = navController,
32-
startDestination = Destination.Home.route
33-
) {
34-
val pillShape = RoundedCornerShape(50)
30+
NavHost(navController = navController, startDestination = Destination.Home.route) {
31+
val pillShape = RoundedCornerShape(50)
3532

36-
composable(Destination.Home.route) {
37-
Column(
38-
modifier = Modifier.fillMaxSize(),
39-
horizontalAlignment = Alignment.CenterHorizontally,
40-
verticalArrangement = Arrangement.Center
41-
) {
42-
BasicText(
43-
modifier = Modifier
44-
.border(2.dp, Color.Gray, pillShape)
45-
.clip(pillShape)
46-
.clickable {
47-
navController.navigate(Destination.Details.route)
48-
}
49-
.padding(24.dp),
50-
text = "Home. Tap to go to Details."
51-
)
52-
}
53-
}
54-
composable(Destination.Details.route) {
55-
Column(
56-
modifier = Modifier.fillMaxSize(),
57-
horizontalAlignment = Alignment.CenterHorizontally,
58-
verticalArrangement = Arrangement.Center
59-
) {
60-
BasicText(
61-
modifier = Modifier
62-
.border(2.dp, Color.Gray, pillShape)
63-
.clip(pillShape)
64-
.clickable {
65-
navController.popBackStack()
66-
}
67-
.padding(24.dp),
68-
text = "Details. Tap or press back to return."
69-
)
70-
}
71-
}
72-
}
33+
composable(Destination.Home.route) {
34+
Column(
35+
modifier = Modifier.fillMaxSize(),
36+
horizontalAlignment = Alignment.CenterHorizontally,
37+
verticalArrangement = Arrangement.Center,
38+
) {
39+
BasicText(
40+
modifier =
41+
Modifier.border(2.dp, Color.Gray, pillShape)
42+
.clip(pillShape)
43+
.clickable { navController.navigate(Destination.Details.route) }
44+
.padding(24.dp),
45+
text = "Home. Tap to go to Details.",
46+
)
47+
}
7348
}
49+
composable(Destination.Details.route) {
50+
Column(
51+
modifier = Modifier.fillMaxSize(),
52+
horizontalAlignment = Alignment.CenterHorizontally,
53+
verticalArrangement = Arrangement.Center,
54+
) {
55+
BasicText(
56+
modifier =
57+
Modifier.border(2.dp, Color.Gray, pillShape)
58+
.clip(pillShape)
59+
.clickable { navController.popBackStack() }
60+
.padding(24.dp),
61+
text = "Details. Tap or press back to return.",
62+
)
63+
}
64+
}
65+
}
7466
}
67+
}
7568

76-
sealed class Destination(
77-
val route: String
78-
) {
79-
object Home : Destination("home")
80-
object Details : Destination("details")
81-
}
69+
sealed class Destination(val route: String) {
70+
object Home : Destination("home")
71+
72+
object Details : Destination("details")
73+
}
8274
}

0 commit comments

Comments
 (0)