Merge pull request #12 from Konyaco/dev

Konyaco · web-flow · commit 9a5b19a5a408 · 2023-04-20T13:12:08.000+08:00
Update Screenshoot
diff --git a/assets/screenshot.png b/assets/screenshot.png
diff --git a/example/android/build.gradle.kts b/example/android/build.gradle.kts
@@ -23,10 +23,6 @@ android {
             useSupportLibrary = true
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
     buildTypes {
         getByName("release") {
             isMinifyEnabled = true
@@ -41,6 +37,14 @@ android {
             excludes.add("/META-INF/{AL2.0,LGPL2.1}")
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}
+
+kotlin {
+    jvmToolchain(11)
 }
 
 dependencies {
diff --git a/example/common/build.gradle.kts b/example/common/build.gradle.kts
@@ -21,12 +21,12 @@ kotlin {
         val jvmMain by getting
         val jvmTest by getting
     }
+    jvmToolchain(11)
 }
 
 android {
     compileSdk = 33
     namespace = "com.konyaco.fluent.example"
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = 24
         targetSdk = 33
diff --git a/example/desktop/build.gradle.kts b/example/desktop/build.gradle.kts
@@ -15,6 +15,7 @@ kotlin {
         }
         val jvmTest by getting
     }
+    jvmToolchain(11)
 }
 
 compose.desktop {
diff --git a/fluent-icons-core/build.gradle.kts b/fluent-icons-core/build.gradle.kts
@@ -27,6 +27,7 @@ kotlin {
         }
         val jvmTest by getting
     }
+    jvmToolchain(11)
 }
 
 android {
diff --git a/fluent-icons-extended/build.gradle.kts b/fluent-icons-extended/build.gradle.kts
@@ -29,6 +29,7 @@ kotlin {
         }
         val jvmTest by getting
     }
+    jvmToolchain(11)
 }
 
 android {
diff --git a/fluent/build.gradle.kts b/fluent/build.gradle.kts
@@ -41,6 +41,7 @@ kotlin {
         }
         val jvmTest by getting
     }
+    jvmToolchain(11)
 }
 
 android {
@@ -54,14 +55,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlin {
-        jvmToolchain(11)
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
 }
 
 val javadocJar by tasks.registering(Jar::class) {

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,6 @@ android {`
`23`	`23`	`useSupportLibrary = true`
`24`	`24`	`}`
`25`	`25`	`}`
`26`		`- compileOptions {`
`27`		`- sourceCompatibility = JavaVersion.VERSION_11`
`28`		`- targetCompatibility = JavaVersion.VERSION_11`
`29`		`- }`
`30`	`26`	`buildTypes {`
`31`	`27`	`getByName("release") {`
`32`	`28`	`isMinifyEnabled = true`
`@@ -41,6 +37,14 @@ android {`
`41`	`37`	`excludes.add("/META-INF/{AL2.0,LGPL2.1}")`
`42`	`38`	`}`
`43`	`39`	`}`
	`40`	`+ compileOptions {`
	`41`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`42`	`+ targetCompatibility = JavaVersion.VERSION_11`
	`43`	`+ }`
	`44`	`+}`
	`45`	`+`
	`46`	`+kotlin {`
	`47`	`+ jvmToolchain(11)`
`44`	`48`	`}`
`45`	`49`
`46`	`50`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ kotlin {`
`21`	`21`	`val jvmMain by getting`
`22`	`22`	`val jvmTest by getting`
`23`	`23`	`}`
	`24`	`+ jvmToolchain(11)`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`android {`
`27`	`28`	`compileSdk = 33`
`28`	`29`	`namespace = "com.konyaco.fluent.example"`
`29`		`- sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")`
`30`	`30`	`defaultConfig {`
`31`	`31`	`minSdk = 24`
`32`	`32`	`targetSdk = 33`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ kotlin {`
`15`	`15`	`}`
`16`	`16`	`val jvmTest by getting`
`17`	`17`	`}`
	`18`	`+ jvmToolchain(11)`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`compose.desktop {`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ kotlin {`
`27`	`27`	`}`
`28`	`28`	`val jvmTest by getting`
`29`	`29`	`}`
	`30`	`+ jvmToolchain(11)`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ kotlin {`
`29`	`29`	`}`
`30`	`30`	`val jvmTest by getting`
`31`	`31`	`}`
	`32`	`+ jvmToolchain(11)`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ kotlin {`
`41`	`41`	`}`
`42`	`42`	`val jvmTest by getting`
`43`	`43`	`}`
	`44`	`+ jvmToolchain(11)`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`android {`
`@@ -54,14 +55,6 @@ android {`
`54`	`55`	`sourceCompatibility = JavaVersion.VERSION_11`
`55`	`56`	`targetCompatibility = JavaVersion.VERSION_11`
`56`	`57`	`}`
`57`		`- kotlin {`
`58`		`- jvmToolchain(11)`
`59`		`- }`
`60`		`-}`
`61`		`-`
`62`		`-java {`
`63`		`- sourceCompatibility = JavaVersion.VERSION_11`
`64`		`- targetCompatibility = JavaVersion.VERSION_11`
`65`	`58`	`}`
`66`	`59`
`67`	`60`	`val javadocJar by tasks.registering(Jar::class) {`