Java 17

hannesa2 · hannesa2 · commit aae7daf738c8 · 2023-11-03T10:10:02.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Make gradlew executable
         run: chmod +x ./gradlew
       - name: Build with Gradle
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,11 +29,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 
     buildFeatures {
diff --git a/openai/build.gradle b/openai/build.gradle
@@ -22,11 +22,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
 }
 
@@ -40,4 +40,5 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
+    api "com.github.AppDevNext.Logcat:LogcatCoreLib:3.2"
 }
diff --git a/settings.gradle b/settings.gradle
@@ -10,6 +10,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 }
 rootProject.name = "ChatGPTWrapper"

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ android {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`compileOptions {`
`32`		`- sourceCompatibility JavaVersion.VERSION_11`
`33`		`- targetCompatibility JavaVersion.VERSION_11`
	`32`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`33`	`+ targetCompatibility JavaVersion.VERSION_17`
`34`	`34`	`}`
`35`	`35`	`kotlinOptions {`
`36`		`- jvmTarget = '11'`
	`36`	`+ jvmTarget = '17'`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`buildFeatures {`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ android {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`compileOptions {`
`25`		`- sourceCompatibility JavaVersion.VERSION_11`
`26`		`- targetCompatibility JavaVersion.VERSION_11`
	`25`	`+ sourceCompatibility JavaVersion.VERSION_17`
	`26`	`+ targetCompatibility JavaVersion.VERSION_17`
`27`	`27`	`}`
`28`	`28`	`kotlinOptions {`
`29`		`- jvmTarget = '11'`
	`29`	`+ jvmTarget = '17'`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -40,4 +40,5 @@ dependencies {`
`40`	`40`	`implementation 'com.squareup.retrofit2:retrofit:2.9.0'`
`41`	`41`	`implementation 'com.squareup.retrofit2:converter-gson:2.9.0'`
`42`	`42`	`implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'`
	`43`	`+ api "com.github.AppDevNext.Logcat:LogcatCoreLib:3.2"`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ dependencyResolutionManagement {`
`10`	`10`	`repositories {`
`11`	`11`	`google()`
`12`	`12`	`mavenCentral()`
	`13`	`+ maven { url 'https://jitpack.io' }`
`13`	`14`	`}`
`14`	`15`	`}`
`15`	`16`	`rootProject.name = "ChatGPTWrapper"`