Merge pull request #136 from AppDevNext/AndroidGiraffe

hannesa2 · web-flow · commit fa9febb85066 · 2023-08-03T08:02:31.000+02:00
Android Studio Giraffe
diff --git a/.github/workflows/Android-CI-release.yml b/.github/workflows/Android-CI-release.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: "adopt"
-          java-version: 11
+          java-version: 17
       - name: Get the version
         id: tagger
         uses: jimschubert/query-tag-action@v2
diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: macOS-latest
     strategy:
       matrix:
-        java_version: [ 11 ]
+        java_version: [ 17 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3.5.3
@@ -59,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java_version: [ 11 ]
+        java_version: [ 17 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3.5.3
diff --git a/MPChartExample/build.gradle b/MPChartExample/build.gradle
@@ -14,7 +14,13 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
     }
-
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
     buildTypes {
         release {
             minifyEnabled false
diff --git a/MPChartLib/build.gradle b/MPChartLib/build.gradle
@@ -25,6 +25,10 @@ android {
 
         consumerProguardFiles 'proguard-project.txt'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
     buildTypes {
         release {
             minifyEnabled false
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
diff --git a/gradle.properties b/gradle.properties
@@ -7,3 +7,6 @@ org.gradle.jvmargs=-Xmx2048M
 SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true
 POM_ARTIFACT_ID=chart
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/jitpack.yml b/jitpack.yml
@@ -1,5 +1,5 @@
 jdk:
- - openjdk11
+ - openjdk17
 install:
  - ./gradlew :MPChartLib:build :MPChartLib:publishToMavenLocal -x :MPChartLib:test
  - find . -name "*.aar"

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`mavenCentral()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:7.4.2'`
	`9`	`+ classpath 'com.android.tools.build:gradle:8.1.0'`
`10`	`10`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'`
`11`	`11`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`12`	`12`	`}`