diff --git a/app/build.gradle b/app/build.gradle index 30c35c9c..cbfb90a7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,12 @@ android { buildFeatures { viewBinding true } - namespace 'info.touchimage.demo' + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + namespace 'info.touchimage.demo' } dependencies { diff --git a/build.gradle b/build.gradle index 646c2569..0e606da5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ import org.gradle.internal.jvm.Jvm buildscript { - ext.kotlin_version = '1.9.0' + ext.kotlin_version = '1.8.22' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle.properties b/gradle.properties index 5465fec0..9dcb757d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,6 @@ android.enableJetifier=true -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true + +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33c..42defcc9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jitpack.yml b/jitpack.yml index 9118d70f..bbca236a 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,4 +1,4 @@ jdk: - - openjdk11 + - openjdk17 install: - ./gradlew :touchview:build :touchview:publishToMavenLocal -x :touchview:test diff --git a/touchview/build.gradle b/touchview/build.gradle index 9366eb4e..2f4efc8f 100644 --- a/touchview/build.gradle +++ b/touchview/build.gradle @@ -9,6 +9,12 @@ android { defaultConfig { minSdkVersion 16 + aarMetadata { + minCompileSdk = 28 + } + testFixtures { + enable = true + } targetSdkVersion defaultTargetSdkVersion buildConfigField "String", 'VERSION', "\"" + versionName + "\"" @@ -22,6 +28,10 @@ android { } namespace 'com.ortiz.touchview' + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } } dependencies { @@ -29,10 +39,10 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } -project.afterEvaluate { - publishing { - publications { - release(MavenPublication) { +publishing { + publications { + release(MavenPublication) { + afterEvaluate { from components.release } }