File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -21,12 +21,12 @@ buildscript {
2121// Top-level build file where you can add configuration options common to all sub-projects/modules.
2222plugins {
2323 id ' org.jetbrains.kotlin.plugin.compose' version ' 2.3.0' apply false
24- id ' com.android.library' version ' 8.13.2 ' apply false
24+ id ' com.android.library' version ' 9.0.0 ' apply false
2525 id ' org.jetbrains.kotlin.android' version " $kotlinVersion " apply false
26- id " org.jetbrains.kotlin. kapt" version " $k otlinVersion " apply false
26+ id " com.android.legacy- kapt" version ' 9.0.0 ' apply false
2727 id " com.diffplug.spotless" version " 8.1.0" apply false
2828 id ' io.gitlab.arturbosch.detekt' version ' 1.23.8' apply false
29- id ' com.android.application' version ' 8.13.2 ' apply false
29+ id ' com.android.application' version ' 9.0.0 ' apply false
3030}
3131
3232tasks. register(' clean' , Delete ) {
Original file line number Diff line number Diff line change 77
88plugins {
99 id ' com.android.library'
10- id ' org.jetbrains.kotlin.android'
1110 id ' maven-publish'
1211}
1312
@@ -16,7 +15,6 @@ android {
1615 defaultConfig {
1716 minSdk = 21
1817 compileSdk = 36
19- targetSdk = 36
2018
2119 testInstrumentationRunner " androidx.test.runner.AndroidJUnitRunner"
2220 }
@@ -25,22 +23,23 @@ android {
2523 unitTests {
2624 includeAndroidResources = true
2725 }
26+ targetSdk 36
2827 }
2928
3029 compileOptions {
3130 sourceCompatibility JavaVersion . VERSION_17
3231 targetCompatibility JavaVersion . VERSION_17
3332 }
34- kotlinOptions {
35- jvmTarget = ' 17'
36- }
3733 namespace ' com.nextcloud.android.common.core'
3834
3935 publishing {
4036 singleVariant(' release' ) {
4137 withSourcesJar()
4238 }
4339 }
40+ lint {
41+ targetSdk 36
42+ }
4443}
4544
4645dependencies {
Original file line number Diff line number Diff line change @@ -9,3 +9,9 @@ kotlin.code.style=official
99# thereby reducing the size of the R class for that library
1010android.nonTransitiveRClass =true
1111android.nonFinalResIds =false
12+ android.defaults.buildfeatures.resvalues =true
13+ android.enableAppCompileTimeRClass =false
14+ android.uniquePackageNames =false
15+ android.dependency.useConstraints =true
16+ android.r8.strictFullModeForKeepRules =false
17+ android.newDsl =false
Load Diff Large diffs are not rendered by default.
Original file line number Diff line number Diff line change 77
88plugins {
99 id ' com.android.application'
10- id ' org.jetbrains.kotlin.android'
1110}
1211
1312android {
@@ -17,7 +16,6 @@ android {
1716 applicationId " com.nextcloud.android.common.sample"
1817 minSdk = 26
1918 compileSdk = 36
20- targetSdk = 36
2119 versionCode 1
2220 versionName " 1.0"
2321
@@ -34,9 +32,7 @@ android {
3432 sourceCompatibility JavaVersion . VERSION_17
3533 targetCompatibility JavaVersion . VERSION_17
3634 }
37- kotlinOptions {
38- jvmTarget = ' 17'
39- }
35+
4036 buildFeatures {
4137 viewBinding true
4238 }
Original file line number Diff line number Diff line change 88plugins {
99 id ' org.jetbrains.kotlin.plugin.compose'
1010 id ' com.android.library'
11- id ' org.jetbrains. kotlin.android '
12- id ' org.jetbrains.kotlin. kapt'
11+ id ' com.android.built-in- kotlin'
12+ id ' com.android.legacy- kapt'
1313 id ' maven-publish'
1414}
1515
1616android {
1717 defaultConfig {
1818 minSdk = 21
1919 compileSdk = 36
20- targetSdk = 36
2120
2221 testInstrumentationRunner " androidx.test.runner.AndroidJUnitRunner"
2322 }
@@ -30,16 +29,19 @@ android {
3029 sourceCompatibility JavaVersion . VERSION_17
3130 targetCompatibility JavaVersion . VERSION_17
3231 }
33- kotlinOptions {
34- jvmTarget = ' 17'
35- }
3632 namespace ' com.nextcloud.android.common.ui'
3733
3834 publishing {
3935 singleVariant(' release' ) {
4036 withSourcesJar()
4137 }
4238 }
39+ lint {
40+ targetSdk 36
41+ }
42+ testOptions {
43+ targetSdk 36
44+ }
4345}
4446
4547dependencies {
You can’t perform that action at this time.
0 commit comments