diff --git a/app/build.gradle b/app/build.gradle index 58dbcef9..9897d597 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,12 +2,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - namespace 'de.markusfisch.android.binaryeye' - compileSdkVersion sdk_version - defaultConfig { - minSdkVersion 9 - targetSdkVersion sdk_version + namespace "de.markusfisch.android.binaryeye" + compileSdk sdk_version + defaultConfig { + minSdk 9 + targetSdk sdk_version versionCode 127 versionName '1.62.3' } @@ -53,7 +53,6 @@ android { } } - compileOptions { // Required for Gradle 8. sourceCompatibility = 17 @@ -62,15 +61,21 @@ android { } dependencies { - testImplementation 'junit:junit:4.13.2' - + // Kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Support implementation "com.android.support:appcompat-v7:$support_version" implementation "com.android.support:design:$support_version" implementation "com.android.support:preference-v7:$support_version" implementation "com.android.support:preference-v14:$support_version" + + // External implementation 'com.github.markusfisch:CameraView:1.9.2' implementation 'com.github.markusfisch:ScalingImageView:1.4.1' implementation 'com.github.markusfisch:zxing-cpp:v2.2.0.1' + + // Testing + testImplementation 'junit:junit:4.13.2' } diff --git a/build.gradle b/build.gradle index c0f064b2..4791b9a1 100644 --- a/build.gradle +++ b/build.gradle @@ -18,19 +18,15 @@ buildscript { } allprojects { - repositories { - google() - mavenCentral() - maven { url 'https://jitpack.io' } - } - gradle.projectsEvaluated { - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:unchecked" + tasks.withType(JavaCompile).tap { + configureEach { + options.compilerArgs << "-Xlint:unchecked" + } } } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index afcecbf1..2c0e6eae 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionPath=wrapper/dists +networkTimeout=10000 zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index e7b4def4..d1d9f323 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,18 @@ +pluginManagement { + repositories { + google() + mavenCentral() + maven { url 'https://jitpack.io' } + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { url 'https://jitpack.io' } + } +} + +rootProject.name = "Binary Eye" include ':app'