diff --git a/app/build.gradle b/app/build.gradle index bbc090d..5eb8901 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'org.jmailen.kotlinter' version '4.0.0' + id 'org.jmailen.kotlinter' version '4.2.0' } android { @@ -31,6 +31,7 @@ android { } buildFeatures { viewBinding true + buildConfig true } compileOptions { sourceCompatibility JavaVersion.VERSION_17 @@ -68,7 +69,7 @@ dependencies { implementation project(':client') implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-splashscreen:1.0.1' - implementation 'com.google.android.material:material:1.10.0' + implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.vectordrawable:vectordrawable:1.1.0' diff --git a/build.gradle b/build.gradle index 530a4b2..6225e2a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,38 +1,16 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - - repositories { - google() - } - dependencies { - classpath 'com.android.tools.build:gradle:8.1.3' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - plugins { + id 'com.android.application' version '8.3.0' apply false + id 'org.jetbrains.kotlin.android' version '1.9.22' apply false id 'org.hidetake.swagger.generator' version '2.14.0' } ext { gotifyVersion = 'master' - specLocation = "$buildDir/gotify.spec.json" -} - -allprojects { - repositories { - google() - mavenCentral() - maven { url "https://jitpack.io/" } - } + specLocation = "$layout.buildDirectory/gotify.spec.json" } tasks.register('clean', Delete) { - delete rootProject.buildDir + delete rootProject.layout.buildDirectory } static def download(String url, String filename ) { @@ -49,7 +27,7 @@ static def download(String url, String filename ) { tasks.register('downloadSpec') { inputs.property 'version', gotifyVersion doFirst { - buildDir.mkdirs() + layout.buildDirectory.mkdirs() download("https://raw.githubusercontent.com/gotify/server/${gotifyVersion}/docs/spec.json", specLocation) } } diff --git a/client/build.gradle b/client/build.gradle index a7aebf0..939a925 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -4,17 +4,6 @@ apply plugin: 'eclipse' group = 'io.swagger' version = '1.0.0' -buildscript { - repositories { - google() - } -} - -repositories { - jcenter() -} - - apply plugin: 'java-library' sourceCompatibility = JavaVersion.VERSION_1_7 diff --git a/gradle.properties b/gradle.properties index 65539cb..8cb3e5a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,6 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true android.nonFinalResIds=true android.nonTransitiveRClass=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f86..4baf5a1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle b/settings.gradle index d1ef5e3..7c42c19 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,17 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { url "https://jitpack.io/" } + } +} +rootProject.name = "Gotify Android" include ':app' include ':client' \ No newline at end of file