V0.2.2 (#48)

* * init * updated Compose to latest version * * Made Compose Foundation a compileOnly dependency * Deleted unnecessary AndroidMain Compose dependency * Updated README.md to reflect new method of implementation * * Made Compose Foundation a compileOnly dependency * Deleted unnecessary AndroidMain Compose dependency * Updated README.md to reflect new method of implementation * * Upgraded the Javascript compiler to IR * added JS dependency on org.jetbrains.compose.html:html-core * added API calls to compose compileOnly dependencies * disabled javascript for basic-images until ImageBitmap is figured out. * Reverted to Kotlin 2.0.21 to stop requiring users to implement beta features. * Updating Dokka * Updated documentation to reflect kotlin 2.0.21 * Updated documentation to reflect kotlin 2.1.0 * * init * updated Compose to latest version * * Made Compose Foundation a compileOnly dependency * Deleted unnecessary AndroidMain Compose dependency * Updated README.md to reflect new method of implementation * * Made Compose Foundation a compileOnly dependency * Deleted unnecessary AndroidMain Compose dependency * Updated README.md to reflect new method of implementation * * Upgraded the Javascript compiler to IR * added JS dependency on org.jetbrains.compose.html:html-core * added API calls to compose compileOnly dependencies * disabled javascript for basic-images until ImageBitmap is figured out. * Reverted to Kotlin 2.0.21 to stop requiring users to implement beta features. * Updating Dokka * Updated documentation to reflect kotlin 2.0.21 * Updated documentation to reflect kotlin 2.1.0
LexiLabs-App · Nov 29, 2024 · 30ca45c · 30ca45c
1 parent 657f7ff
commit 30ca45c
Show file tree

Hide file tree

Showing 171 changed files with 236 additions and 199 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 ![GitHub License](https://img.shields.io/github/license/lexilabs-app/basic)
 ![GitHub Release Date](https://img.shields.io/github/release-date/lexilabs-app/basic)
-[![Kotlin](https://img.shields.io/badge/Kotlin-2.1.0--RC2-7f52ff.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/Kotlin-2.1.0-7f52ff.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
 
 A Kotlin Multiplatform library to rapidly add basic features like pictures, logging, and audio to any project in a small and fast way.
 
@@ -32,7 +32,7 @@ Add your dependencies from Maven
 ```toml
 # in your 'gradle/libs.versions.toml' file
 [versions]
-kotlin = "2.1.0-RC2" # Updated Kotlin version required for Basic-Sound due to hotfix for reading Compose Resources
+kotlin = "2.1.0" # Updated Kotlin version required for Basic-Sound due to hotfix for reading Compose Resources
 lexilabs-basic = "+" # gets the latest version
 
 [libraries]

diff --git a/basic-ads/README.md b/basic-ads/README.md
@@ -31,17 +31,28 @@ Add your dependencies from Maven
 ```toml
 # in your 'libs.versions.toml' file
 [versions]
+kotlin = "2.1.0"
+compose = "+" # gets the latest version
 lexilabs-basic = "+" # gets the latest version
 google-play-services-ads = "+" # you did this during the preparation step
 
 [libraries]
 lexilabs-basic-images = { module = "app.lexilabs.basic:basic-ads", version.ref = "lexilabs-basic"}
 google-play-services-ads = { module = "com.google.android.gms:play-services-ads", version.ref = "google-play-services-ads"}
+
+[plugins] # make sure you're using the JetBrains plugin to import your composables
+jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ```
 
 then include the library in your gradle build
 ```kotlin
 // in your 'composeApp/build.gradle.kts' file
+plugins {
+    alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.compose.compiler)
+}
+
 sourceSets {
     commonMain.dependencies {
         implementation(libs.lexilabs.basic.ads)

diff --git a/basic-ads/build.gradle.kts b/basic-ads/build.gradle.kts
@@ -1,5 +1,5 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
@@ -46,12 +46,12 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(libs.compose.foundation)
+            compileOnly(libs.compose.foundation)
+            api(libs.compose.foundation)
             implementation(libs.annotations)
             implementation(project(":basic-logging"))
         }
         androidMain.dependencies {
-            implementation(libs.compose.ui)
             compileOnly(libs.google.play.services.ads)
         }
         iosMain.dependencies {}
@@ -66,8 +66,6 @@ kotlin {
         }
     }
 
-    // https://youtrack.jetbrains.com/issue/KT-61573
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
     }

diff --git a/basic-images/README.md b/basic-images/README.md
@@ -25,14 +25,25 @@ Add your dependencies from Maven
 ```toml
 # in your 'libs.versions.toml' file
 [versions]
+kotlin = "2.1.0" # gets the latest version, but MUST BE 2.1.0 OR HIGHER
+compose = "+" # gets the latest version
 lexilabs-basic = "+" #gets the latest version
 
 [libraries]
 lexilabs-basic-images = { module = "app.lexilabs.basic:basic-images", version.ref = "lexilabs-basic"}
+
+[plugins] # make sure you're using the JetBrains plugin to import your composables
+jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ```
 then include the library in your gradle build
 ```kotlin
 // in your 'shared/build.gradle.kts' file
+plugins {
+    alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.compose.compiler)
+}
+
 sourceSets {
     commonMain.dependencies {
         implementation(libs.lexilabs.basic.images)

diff --git a/basic-images/build.gradle.kts b/basic-images/build.gradle.kts
@@ -1,5 +1,5 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
@@ -19,15 +19,22 @@ kotlin {
 
     jvm()
 
-//    js {
+//    js(IR) {
+//        binaries.executable()
 //        browser {
-//            webpackTask {
-//                mainOutputFileName = "shared.js"
+//            commonWebpackConfig {
+//                cssSupport {
+//                    enabled.set(true)
+//                }
+//            }
+//            testTask {
+//                useKarma {
+//                    useChromeHeadless()
+//                }
 //            }
 //        }
-//        binaries.executable()
 //    }
-//
+
 //    @OptIn(ExperimentalWasmDsl::class)
 //    wasmJs {
 //        browser()
@@ -70,7 +77,8 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             implementation(project(":basic-logging"))
-            implementation(libs.compose.foundation)
+            compileOnly(libs.compose.foundation)
+            api(libs.compose.foundation)
             implementation(libs.compose.material3)
             implementation(libs.ktor.client.core)
             implementation(libs.ktor.client.resources)
@@ -92,7 +100,9 @@ kotlin {
 //            implementation(libs.ktor.client.ios)
 //        }
 //        jvmMain.dependencies {}
-//        jsMain.dependencies {}
+//        jsMain.dependencies {
+//            implementation(libs.compose.html)
+//        }
 //        wasmJsMain.dependencies {}
 //        linuxMain.dependencies {}
 //        mingwMain.dependencies {}
@@ -107,8 +117,6 @@ kotlin {
         }
     }
 
-    // https://youtrack.jetbrains.com/issue/KT-61573
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
     }

diff --git a/basic-logging/build.gradle.kts b/basic-logging/build.gradle.kts
@@ -1,6 +1,6 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
@@ -22,13 +22,20 @@ kotlin {
 
     jvm()
 
-    js {
+    js(IR) {
+        binaries.executable()
         browser {
-            webpackTask {
-                mainOutputFileName = "shared.js"
+            commonWebpackConfig {
+                cssSupport {
+                    enabled.set(true)
+                }
+            }
+            testTask {
+                useKarma {
+                    useChromeHeadless()
+                }
             }
         }
-        binaries.executable()
     }
 
     @OptIn(ExperimentalWasmDsl::class)
@@ -93,8 +100,6 @@ kotlin {
         }
     }
 
-    // https://youtrack.jetbrains.com/issue/KT-61573
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
     }

diff --git a/basic-sound/README.md b/basic-sound/README.md
@@ -35,7 +35,7 @@ You'll need to add your maven dependency list
 ```toml
 # in your 'libs.versions.toml' file
 [versions]
-kotlin = "2.1.0-RC2" # Updated Kotlin version required due to hotfix for Composable Resources
+kotlin = "2.1.0" # Updated Kotlin version required due to Composable Resources
 lexilabs-basic = "+" # gets the latest version
 
 [libraries]

diff --git a/basic-sound/build.gradle.kts b/basic-sound/build.gradle.kts
@@ -1,6 +1,6 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
@@ -17,13 +17,20 @@ kotlin {
     // FORCES CHECK OF PUBLIC API DECLARATIONS
     explicitApi()
 
-    js {
+    js(IR) {
+        binaries.executable()
         browser {
-            webpackTask {
-                mainOutputFileName = "shared.js"
+            commonWebpackConfig {
+                cssSupport {
+                    enabled.set(true)
+                }
+            }
+            testTask {
+                useKarma {
+                    useChromeHeadless()
+                }
             }
         }
-        binaries.executable()
     }
 
     @OptIn(ExperimentalWasmDsl::class)
@@ -81,8 +88,6 @@ kotlin {
         }
     }
 
-    // https://youtrack.jetbrains.com/issue/KT-61573
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
     compilerOptions {
         freeCompilerArgs.add("-Xexpect-actual-classes")
     }
@@ -111,4 +116,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-}
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,7 +14,7 @@ buildscript {
 
 allprojects {
     group = "app.lexilabs.basic"
-    version = "0.2.1"
+    version = "0.2.2"
 
     apply(plugin = "org.jetbrains.dokka")
     apply(plugin = "maven-publish")

diff --git a/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-error/-ad-error.html b/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-error/-ad-error.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector common-like" data-active="" data-filter=":basic-ads:dokkaHtml/iosMain">ios</button>

diff --git a/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-error/index.html b/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-error/index.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>

diff --git a/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/-ad-loader.html b/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/-ad-loader.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>

diff --git a/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/index.html b/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/index.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>

diff --git a/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/load-interstitial-ad.html b/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/load-interstitial-ad.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>

diff --git a/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/load-rewarded-ad.html b/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/load-rewarded-ad.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>

diff --git a/.../basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/load-rewarded-interstitial-ad.html b/.../basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/load-rewarded-interstitial-ad.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>

diff --git a/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/request-ad.html b/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/request-ad.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>

diff --git a/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/show-interstitial-ad.html b/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/show-interstitial-ad.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>

diff --git a/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/show-rewarded-ad.html b/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/show-rewarded-ad.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>

diff --git a/.../basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/show-rewarded-interstitial-ad.html b/.../basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-loader/show-rewarded-interstitial-ad.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>

diff --git a/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-request/index.html b/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-request/index.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>

diff --git a/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-size/-ad-size.html b/docs/basic-ads/basic-ads/app.lexilabs.basic.ads/-ad-size/-ad-size.html
@@ -45,7 +45,7 @@
                     </a>
             </div>
             <div class="library-version">
-0.2.1            </div>
+0.2.2            </div>
         </div>
         <div class="filter-section" id="filter-section">
                 <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":basic-ads:dokkaHtml/androidMain">android</button>