Skip to content

Bump AGP to v9.0.0 #863

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

Open
AndyScherzinger wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump AGP to v9.0.0 #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/codeStyles/codeStyleConfig.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ buildscript {
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'org.jetbrains.kotlin.plugin.compose' version '2.3.0' apply false
id 'com.android.library' version '8.13.2' apply false
id 'com.android.library' version '9.0.0' apply false
id 'org.jetbrains.kotlin.android' version "$kotlinVersion" apply false
id "org.jetbrains.kotlin.kapt" version "$kotlinVersion" apply false
id "com.android.legacy-kapt" version '9.0.0' apply false
id "com.diffplug.spotless" version "8.1.0" apply false
id 'io.gitlab.arturbosch.detekt' version '1.23.8' apply false
id 'com.android.application' version '8.13.2' apply false
id 'com.android.application' version '9.0.0' apply false
}

tasks.register('clean', Delete) {
Expand Down
9 changes: 4 additions & 5 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@

plugins {
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
id 'maven-publish'
}

android {
defaultConfig {
minSdk = 21
compileSdk = 36
targetSdk = 36

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -24,22 +22,23 @@ android {
unitTests {
includeAndroidResources = true
}
targetSdk 36
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
namespace 'com.nextcloud.android.common.core'

publishing {
singleVariant('release') {
withSourcesJar()
}
}
lint {
targetSdk 36
}
}

dependencies {
Expand Down
6 changes: 6 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ kotlin.code.style=official
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonFinalResIds=false
android.defaults.buildfeatures.resvalues=true
android.enableAppCompileTimeRClass=false
android.uniquePackageNames=false
android.dependency.useConstraints=true
android.r8.strictFullModeForKeepRules=false
android.newDsl=false
824 changes: 824 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}

android {
Expand All @@ -17,7 +16,6 @@ android {
applicationId "com.nextcloud.android.common.sample"
minSdk = 26
compileSdk = 36
targetSdk = 36
versionCode 1
versionName "1.0"

Expand All @@ -34,9 +32,7 @@ android {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}

buildFeatures {
viewBinding true
}
Expand Down
14 changes: 8 additions & 6 deletions ui/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@
plugins {
id 'org.jetbrains.kotlin.plugin.compose'
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.kapt'
id 'com.android.built-in-kotlin'
id 'com.android.legacy-kapt'
id 'maven-publish'
}

android {
defaultConfig {
minSdk = 21
compileSdk = 36
targetSdk = 36

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -30,16 +29,19 @@ android {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
namespace 'com.nextcloud.android.common.ui'

publishing {
singleVariant('release') {
withSourcesJar()
}
}
lint {
targetSdk 36
}
testOptions {
targetSdk 36
}
}

dependencies {
Expand Down
Loading