Skip to content

Commit

Permalink
Update android gradle version
Browse files Browse the repository at this point in the history
  • Loading branch information
ids1024 committed Jan 9, 2024
1 parent 2d5a8b5 commit 2640c50
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
6 changes: 3 additions & 3 deletions build-words-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

set -e

IMAGE=ids1024/ada-android:6.4.0
IMAGE=docker.io/ids1024/ada-android:6.4.0

sudo docker pull $IMAGE
podman pull $IMAGE

# Disable seccomp for 'personality' syscall, which is used by bionic (in qemu)
sudo docker run \
podman run \
--rm \
-v "$PWD/words:/words" \
-w /words \
Expand Down
7 changes: 6 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.18"
classpath "org.jlleitschuh.gradle:ktlint-gradle:10.3.0"
Expand Down Expand Up @@ -55,6 +55,11 @@ android {
}
}
namespace 'com.ids1024.whitakerswords'
packagingOptions {
jniLibs {
useLegacyPackaging true
}
}
}

repositories {
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true
android.bundle.enableUncompressedNativeLibs=false
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
1 change: 0 additions & 1 deletion src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<application android:label="@string/app_name"
android:icon="@drawable/ic_launcher"
android:theme="@style/AppTheme"
android:extractNativeLibs="true"
android:allowBackup="true"
android:fullBackupContent="@xml/backup_rules">
<activity android:name="WhitakersWords"
Expand Down

0 comments on commit 2640c50

Please sign in to comment.