Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump target sdk version to 35 #926

Merged
merged 2 commits into from
Sep 2, 2024
Merged

Bump target sdk version to 35 #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd6be0b
Bump targetSdk version to 35
NUmeroAndDev Sep 2, 2024
cfbceac
Ignored edge-to-edge in licenses screen
NUmeroAndDev Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app-android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@

<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar" />
android:theme="@style/Theme.KaigiApp.Licenses" />

<activity
android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar" />
android:theme="@style/Theme.KaigiApp.Licenses" />

<provider
android:name="androidx.core.content.FileProvider"
Expand Down
4 changes: 4 additions & 0 deletions app-android/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@
<style name="Theme.KaigiApp" parent="android:Theme.Material.NoActionBar">
<item name="android:statusBarColor">@android:color/transparent</item>
</style>

<style name="Theme.KaigiApp.Licenses" parent="Theme.AppCompat.DayNight.DarkActionBar">
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
</style>
</resources>
4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/AndroidGradleDsl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ fun Project.setupAndroid() {
namespace?.let {
this.namespace = it
}
compileSdkVersion(34)
compileSdkVersion(35)

defaultConfig {
minSdk = 24
targetSdk = 34
targetSdk = 35
}

compileOptions {
Expand Down
Loading