commit 2a57c8b81f0fae7aebda4c8a5dc23ccc8b1cbc63
parent b8d73cf8ad60eba2201ce2675845261c68e4130e
Author: Martin Ashby <martin@ashbysoft.com>
Date: Sat, 4 Apr 2026 21:19:03 +0100
Make it build in newer android studio
Diffstat:
4 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 28
- buildToolsVersion "29.0.3"
defaultConfig {
applicationId "com.github.cythara"
@@ -23,18 +22,24 @@ android {
}
}
- lintOptions {
- disable 'GoogleAppIndexingWarning', 'IconLocation'
- }
compileOptions {
encoding = 'UTF-8'
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
-
packagingOptions {
- exclude 'META-INF/*'
+ jniLibs {
+ excludes += ['META-INF/*']
+ }
+ resources {
+ excludes += ['META-INF/*']
+ }
+ }
+
+ namespace 'com.github.cythara'
+ lint {
+ disable 'GoogleAppIndexingWarning', 'IconLocation'
}
}
@@ -44,7 +49,7 @@ dependencies {
// Other
implementation 'com.jaredrummler:material-spinner:1.3.1'
- implementation 'com.shawnlin:number-picker:2.4.10'
+ implementation 'io.github.ShawnLin013:number-picker:2.4.13'
// Testing libraries
testImplementation 'junit:junit:4.13'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.github.cythara"
android:installLocation="auto">
<uses-permission android:name="android.permission.RECORD_AUDIO" />
diff --git a/build.gradle b/build.gradle
@@ -3,11 +3,11 @@
buildscript {
repositories {
google()
- jcenter()
+ mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.0.1'
+ classpath 'com.android.tools.build:gradle:7.4.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -17,7 +17,7 @@ buildscript {
allprojects {
repositories {
google()
- jcenter()
+ mavenCentral()
}
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sat Apr 04 16:10:27 BST 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists