chore: update settings

RyuNen344 · RyuNen344 · commit ff4860af4b67 · 2024-06-01T07:55:56.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 *.iml
 .idea/androidTestResultsUserPreferences.xml
 .idea/compiler.xml
+.idea/deploymentTargetSelector.xml
 .idea/.name
 .idea/git_toolbox_prj.xml
 .idea/gradle.xml
diff --git a/glyph-compose/build.gradle b/glyph-compose/build.gradle
@@ -12,4 +12,5 @@ android.namespace = "io.github.ryunen344.glyph.compose"
 
 dependencies {
     api files("../Glyph-Developer-Kit/sdk/KetchumSDK_Community_20240307.jar")
+    implementation projects.glyphKtx
 }
diff --git a/gradle/android.gradle b/gradle/android.gradle
@@ -1,9 +1,8 @@
 android {
     compileSdk = 34
     defaultConfig {
-        minSdk = 19
+        minSdk = 34
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        multiDexEnabled = true
         consumerProguardFile "consumer-rules.pro"
     }
     buildTypes {
@@ -16,10 +15,10 @@ android {
     }
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
     publishing {
         singleVariant("release") {
             withSourcesJar()
diff --git a/sample-compose/build.gradle b/sample-compose/build.gradle
@@ -1,7 +1,6 @@
 plugins {
-    alias libs.plugins.com.android.library
+    alias libs.plugins.com.android.application
     alias libs.plugins.org.jetbrains.kotlin.android
-    alias libs.plugins.org.jetbrains.kotlinx.compatibility
 }
 
 apply from: rootProject.layout.projectDirectory.file("gradle/android.gradle")
diff --git a/sample-ktx/build.gradle b/sample-ktx/build.gradle
@@ -1,7 +1,6 @@
 plugins {
-    alias libs.plugins.com.android.library
+    alias libs.plugins.com.android.application
     alias libs.plugins.org.jetbrains.kotlin.android
-    alias libs.plugins.org.jetbrains.kotlinx.compatibility
 }
 
 apply from: rootProject.layout.projectDirectory.file("gradle/android.gradle")

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,5 @@ android.namespace = "io.github.ryunen344.glyph.compose"`
`12`	`12`
`13`	`13`	`dependencies {`
`14`	`14`	`api files("../Glyph-Developer-Kit/sdk/KetchumSDK_Community_20240307.jar")`
	`15`	`+ implementation projects.glyphKtx`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`plugins {`
`2`		`- alias libs.plugins.com.android.library`
	`2`	`+ alias libs.plugins.com.android.application`
`3`	`3`	`alias libs.plugins.org.jetbrains.kotlin.android`
`4`		`- alias libs.plugins.org.jetbrains.kotlinx.compatibility`
`5`	`4`	`}`
`6`	`5`
`7`	`6`	`apply from: rootProject.layout.projectDirectory.file("gradle/android.gradle")`