RegCommit 2023-08-17

ApexCaptain · ApexCaptain · commit e952f621ac6b · 2023-08-17T11:45:14.000+09:00
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/annotations/build.gradle b/annotations/build.gradle
@@ -7,8 +7,8 @@ plugins {
 }
 group='com.github.ApexCaptain'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 dokka {
     outputFormat = "gfm"
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,6 +9,13 @@ apply plugin: 'kotlin-kapt'
 android {
     compileSdkVersion "$compie_sdk_version"
     buildToolsVersion "$build_tools_version"
+
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     defaultConfig {
         applicationId "com.gmail.ayteneve93.blueberrysherbet"
         minSdkVersion sdk_version_min
diff --git a/apt/build.gradle b/apt/build.gradle
@@ -7,8 +7,8 @@ plugins {
 }
 
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 
         /** Bases */
         // Kotlin
-        kotlin_version = '1.6.21'
+        kotlin_version = '1.9.0'
         // Dokka
         dokka_version = "0.10.1"
         // Maven Gradle Plugin
@@ -29,9 +29,9 @@ buildscript {
 
         /** Converters */
         // Gson
-        gson_version = '2.8.7'
+        gson_version = '2.9.0'
         // Moshi
-        moshi_version = '1.12.0'
+        moshi_version = '1.15.0'
         // Simple XML
         simple_xml_version = "2.7.1"
 
@@ -42,7 +42,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     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"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
diff --git a/converter-gson/build.gradle b/converter-gson/build.gradle
@@ -12,6 +12,11 @@ android {
     compileSdkVersion "$compie_sdk_version"
     buildToolsVersion "$build_tools_version"
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     defaultConfig {
         minSdkVersion sdk_version_min
         targetSdkVersion sdk_version_target
diff --git a/converter-moshi/build.gradle b/converter-moshi/build.gradle
@@ -10,6 +10,11 @@ android {
     compileSdkVersion "$compie_sdk_version"
     buildToolsVersion "$build_tools_version"
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     defaultConfig {
         minSdkVersion sdk_version_min
         targetSdkVersion sdk_version_target
diff --git a/converter-simple-xml/build.gradle b/converter-simple-xml/build.gradle
@@ -8,6 +8,11 @@ android {
     compileSdkVersion "$compie_sdk_version"
     buildToolsVersion "$build_tools_version"
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     defaultConfig {
         minSdkVersion sdk_version_min
         targetSdkVersion sdk_version_target
diff --git a/core/build.gradle b/core/build.gradle
@@ -9,6 +9,11 @@ android {
     compileSdkVersion "$compie_sdk_version"
     buildToolsVersion "$build_tools_version"
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     defaultConfig {
         minSdkVersion sdk_version_min
         targetSdkVersion sdk_version_target
diff --git a/gradle.properties b/gradle.properties
@@ -19,3 +19,6 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+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,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ plugins {`
`7`	`7`	`}`
`8`	`8`	`group='com.github.ApexCaptain'`
`9`	`9`
`10`		`-sourceCompatibility = 1.8`
`11`		`-targetCompatibility = 1.8`
	`10`	`+sourceCompatibility = JavaVersion.VERSION_17`
	`11`	`+targetCompatibility = JavaVersion.VERSION_17`
`12`	`12`
`13`	`13`	`dokka {`
`14`	`14`	`outputFormat = "gfm"`