Adding ktlint gradle library (#1)

* Adding ktlint gradle library

* Adding build gradle

* switch to java 11

* Update github-ci.yml

* update to java 17

.github/workflows/github-ci.yml

@@ -34,11 +34,17 @@ jobs:
         run: |
           echo Add other actions to build,
           echo test, and deploy your project.
-     
-     # Grant permissions for gradlew 
+          
+     # Set java version to 17
+      - name: set up JDK 17
+        uses: actions/[email protected]
+        with:
+         java-version: '17'
+
+      # Grant permissions for gradlew
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
-      #- name: Kotlin checkstyle
-       # run: ./gradlew ktlintCheck
-      - name: Build with Gradle
+      - name: Kotlin checkstyle
+        run: ./gradlew ktlintCheck
+      - name: Run tests
         run: ./gradlew test

.gitignore

@@ -38,4 +38,5 @@ bin/
 ### Mac OS ###
 .DS_Store
 
-local.properties
+local.properties
+/java_pid44785.hprof

android/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("org.jetbrains.compose")
     id("com.android.application")
     kotlin("android")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 group = "org.hisp.dhis"
@@ -22,13 +23,18 @@ android {
         versionName = "1.0-SNAPSHOT"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
         }
     }
     namespace = "org.hisp.dhis.android"
-}
+}
+
+ktlint {
+    verbose.set(true)
+    outputToConsole.set(true)
+}

android/src/main/java/org/hisp/dhis/android/MainActivity.kt

@@ -1,10 +1,10 @@
 package org.hisp.dhis.android
 
-import org.hisp.dhis.common.App
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material.MaterialTheme
+import org.hisp.dhis.common.App
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -15,4 +15,4 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
-}
+}

build.gradle.kts

@@ -15,4 +15,5 @@ plugins {
     id("com.android.application") apply false
     id("com.android.library") apply false
     id("org.jetbrains.compose") apply false
-}
+    id("org.jlleitschuh.gradle.ktlint") version "11.5.0"
+}

common/build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     kotlin("multiplatform")
     id("org.jetbrains.compose")
     id("com.android.library")
+    id("org.jlleitschuh.gradle.ktlint")
 }
 
 group = "org.hisp.dhis"
@@ -53,8 +54,13 @@ android {
         targetSdk = 33
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     namespace = "org.hisp.dhis.common"
-}
+}
+
+ktlint {
+    verbose.set(true)
+    outputToConsole.set(true)
+}

common/src/androidMain/kotlin/org/hisp/dhis/common/platform.kt → common/src/androidMain/kotlin/org/hisp/dhis/common/Platform.kt

@@ -2,4 +2,4 @@ package org.hisp.dhis.common
 
 actual fun getPlatformName(): String {
     return "Android"
-}
+}

common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt

@@ -1,7 +1,7 @@
 package org.hisp.dhis.common
 
-import androidx.compose.material.Text
 import androidx.compose.material.Button
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -14,7 +14,7 @@ fun App() {
     val platformName = getPlatformName()
 
     Button(onClick = {
-        text = "Hello, ${platformName}"
+        text = "Hello, $platformName"
     }) {
         Text(text)
     }

common/src/commonMain/kotlin/org/hisp/dhis/common/Platform.kt

@@ -0,0 +1,3 @@
+package org.hisp.dhis.common
+
+expect fun getPlatformName(): String

common/src/desktopMain/kotlin/org/hisp/dhis/common/DesktopApp.kt

@@ -7,4 +7,4 @@ import androidx.compose.runtime.Composable
 @Composable
 fun AppPreview() {
     App()
-}
+}

common/src/desktopMain/kotlin/org/hisp/dhis/common/platform.kt → common/src/desktopMain/kotlin/org/hisp/dhis/common/Platform.kt

@@ -2,4 +2,4 @@ package org.hisp.dhis.common
 
 actual fun getPlatformName(): String {
     return "Desktop"
-}
+}