update compose version to 1.4.3 (#5)

* update compose version to 1.4.3 * Update github-ci.yml * Update github-ci.yml
dhis2 · Jul 28, 2023 · 4933127 · 4933127
1 parent 5f3903f
commit 4933127
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '11'
           cache: 'gradle'
 
       - name: Change wrapper permissions
@@ -60,7 +60,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu' # See 'Supported distributions' for available options
-          java-version: '17'
+          java-version: '11'
           cache: 'gradle'
 
       - name: Change wrapper permissions
@@ -76,4 +76,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) debug generated
-          path: ${{ env.main_project_module }}/build/outputs/apk/debug/
+          path: ${{ env.main_project_module }}/build/outputs/apk/debug/
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         versionName = "1.0-SNAPSHOT"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,14 +1,6 @@
 group = "org.hisp.dhis"
 version = "1.0-SNAPSHOT"
 
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    }
-}
-
 plugins {
     kotlin("multiplatform") apply false
     id("com.android.application") apply false

diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
@@ -6,10 +6,7 @@ plugins {
 }
 
 kotlin {
-    jvm {
-        jvmToolchain(11)
-        withJava()
-    }
+    jvm()
     sourceSets {
         val jvmMain by getting {
             dependencies {

diff --git a/gradle.properties b/gradle.properties
@@ -22,4 +22,4 @@ android.minSdk=24
 #Versions
 kotlin.version=1.8.20
 agp.version=7.4.2
-compose.version=1.4.1
+compose.version=1.4.3
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -27,3 +27,11 @@ pluginManagement {
         id("org.jetbrains.compose").version(composeVersion)
     }
 }
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    }
+}