Update AGP to 8.4.2

This commit is contained in:
Vincent Breitmoser 2024-01-11 10:52:54 +01:00
parent 6f3ce7aadb
commit 3a52071f50
10 changed files with 17 additions and 17 deletions

View File

@ -108,8 +108,8 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
testOptions.unitTests.all {
@ -214,14 +214,6 @@ android {
htmlOutput file('lint-report.html')
}
dexOptions {
preDexLibraries true
// dexInProcess requires much RAM, which is not available on all dev systems
dexInProcess false
jumboMode true
javaMaxHeapSize "2g"
}
buildFeatures {
dataBinding true
}

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.sufficientlysecure.keychain" >
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="com.android.vending.BILLING" />

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.sufficientlysecure.keychain"
android:installLocation="auto">
<!--

View File

@ -10,7 +10,7 @@ buildscript {
dependencies {
// NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.1.4'
// classpath 'com.squareup.sqldelight:gradle-plugin:0.8.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.squareup.sqldelight:gradle-plugin:1.5.4'

View File

@ -8,6 +8,7 @@ android {
targetSdkVersion 28
versionCode 114
versionName "1.1.4"
namespace 'org.sufficientlysecure.materialchips'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

View File

@ -1,4 +1,7 @@
android.enableJetifier=true
android.useAndroidX=true
android.jetifier.ignorelist=bcprov-jdk15on
org.gradle.jvmargs=-Xms128m -Xmx4096m -XX:+CMSClassUnloadingEnabled
org.gradle.jvmargs=-Xms128m -Xmx4096m -XX:+CMSClassUnloadingEnabled
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@ -5,6 +5,7 @@ android {
defaultConfig {
minSdkVersion 14
namespace 'de.cotech.sweetspot'
}
// Do not abort build if lint finds errors

View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="de.cotech.sweetspot" />
<manifest />

View File

@ -18,8 +18,12 @@ android {
lintOptions {
abortOnError false
}
buildFeatures {
aidl true
}
}
/*
// https://developer.android.com/studio/build/maven-publish-plugin
afterEvaluate {
publishing {
@ -49,3 +53,4 @@ afterEvaluate {
}
}
}
*/