Merge pull request #542 from MikeOrtiz/AndroidFlamingo

Android Studio Flamingo
MikeOrtiz · Aug 3, 2023 · d3531e4 · d3531e4
2 parents 39e961f + db6bfd9
commit d3531e4
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10 deletions.
diff --git 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
@@ -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
@@ -1,2 +1,6 @@
 android.enableJetifier=true
-android.useAndroidX=true
+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
@@ -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
@@ -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
@@ -9,6 +9,12 @@ android {
 
     defaultConfig {
         minSdkVersion 16
+        aarMetadata {
+            minCompileSdk = 28
+        }
+        testFixtures {
+            enable = true
+        }
 
         targetSdkVersion defaultTargetSdkVersion
         buildConfigField "String", 'VERSION', "\"" + versionName + "\""
@@ -22,17 +28,21 @@ android {
     }
     namespace 'com.ortiz.touchview'
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {
     api 'androidx.appcompat:appcompat:1.6.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
-project.afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
+publishing {
+    publications {
+        release(MavenPublication) {
+            afterEvaluate {
                 from components.release
             }
         }