Merge pull request #4 from touchlab/sh/structure

KtLint and cleanup

Author: samhill303

.gitignore

@@ -1,58 +1,15 @@
-.DS_Store
-.idea/shelf
-*.iml
-/dependencies/all
-dist
-kotlin-native-*.tar.gz
-translator/src/test/kotlin/tests/*/linked
-out
-tmp
-workspace.xml
-*.versionsBackup
-
 local.properties
 .gradle
-build
-translator/.gradle/2.9/taskArtifacts
-
-kotstd/kotstd.iml
-
-# test suit products.
-*.bc.o
-*.kt.S
-*.kt.exe
-*.log
-test.output
-*.kexe
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
+build/
 
-# Cache of project
-.gradletasknamecache
+.idea/**/*
+!.idea/inspectionProfiles/
+!.idea/inspectionProfiles/**
+!.idea/codeStyles/
+!.idea/codeStyles/**
 
-# local project files
-lib/
-.idea/
-proto/compiler/protoc-artifacts
-proto/compiler/tests
-
-proto/compiler/google/src/google/protobuf/compiler/kotlin/bin
-proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc
-
-peformance/build
-
-# translator auto generated artifacts
-kotstd/ll
-
-# test teamcity property: commitable only with -f
-backend.native/tests/teamcity-test.property
+*.iml
 
-# Sample output
-samples/**/*.kt.bc-build
-samples/androidNativeActivity/Polyhedron
+.DS_Store
+.vscode
 
-.vscode

.idea/codeStyles/Project.xml

@@ -18,7 +18,7 @@ jobs:
           jdkArchitectureOption: 'x64'
           publishJUnitResults: true
           testResultsFiles: '**/TEST-*.xml'
-          tasks: 'build check'
+          tasks: 'build'
 
   - job: "Linux"
     pool:
@@ -34,7 +34,7 @@ jobs:
           jdkArchitectureOption: 'x64'
           publishJUnitResults: true
           testResultsFiles: '**/TEST-*.xml'
-          tasks: 'publishLinuxMips32PublicationToMavenLocal' # No test target, but this will ensure it builds
+          tasks: 'publishLinuxMips32PublicationToMavenLocal linuxX64Test'
 
   - job: "Windows"
     pool:

.idea/codeStyles/codeStyleConfig.xml

@@ -10,12 +10,11 @@ jobs:
         inputs:
           workingDirectory: ''
           gradleWrapperFile: 'gradlew'
+          options: '-Dorg.gradle.internal.http.socketTimeout=120000 -Dorg.gradle.internal.http.connectionTimeout=120000'
           gradleOptions: '-Xmx3072m'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: '1.8'
           jdkArchitectureOption: 'x64'
-          publishJUnitResults: true
-          testResultsFiles: '**/TEST-*.xml'
           tasks: 'publishMac'
         env:
           ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: $(sonatype_user)
@@ -30,12 +29,11 @@ jobs:
         inputs:
           workingDirectory: ''
           gradleWrapperFile: 'gradlew'
+          options: '-Dorg.gradle.internal.http.socketTimeout=120000 -Dorg.gradle.internal.http.connectionTimeout=120000'
           gradleOptions: '-Xmx3072m'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: '1.8'
           jdkArchitectureOption: 'x64'
-          publishJUnitResults: true
-          testResultsFiles: '**/TEST-*.xml'
           tasks: 'publishLinux'
         env:
           ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: $(sonatype_user)
@@ -50,12 +48,11 @@ jobs:
         inputs:
           workingDirectory: ''
           gradleWrapperFile: 'gradlew'
+          options: '-Dorg.gradle.internal.http.socketTimeout=120000 -Dorg.gradle.internal.http.connectionTimeout=120000'
           gradleOptions: '-Xmx3072m'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: '1.8'
           jdkArchitectureOption: 'x64'
-          publishJUnitResults: true
-          testResultsFiles: '**/TEST-*.xml'
           tasks: 'publishWindows'
         env:
           ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: $(sonatype_user)

.idea/inspectionProfiles/ktlint.xml

@@ -19,29 +19,29 @@ buildscript {
         jcenter()
         google()
         gradlePluginPortal()
-//        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
+        classpath "org.jlleitschuh.gradle:ktlint-gradle:9.2.1"
     }
 }
 
 apply plugin: 'org.jetbrains.kotlin.multiplatform'
 
 repositories {
     mavenCentral()
-//    maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
 }
 
 group = GROUP
 version = VERSION_NAME
 
 kotlin {
-    targets {
-//            macosX64("nativeCommon")
         jvm()
-    js()
+        js {
+            browser()
+            nodejs()
+        }
         macosX64()
         iosArm32()
         iosArm64()
@@ -54,10 +54,7 @@ kotlin {
         tvosX64()
         linuxArm32Hfp()
         linuxMips32()
-//    androidNativeArm32()
-//    androidNativeArm64()
         mingwX64()
-    }
     sourceSets {
         commonMain {
             dependencies {
@@ -112,9 +109,6 @@ kotlin {
                    targets.linuxX64,
                    targets.linuxArm32Hfp,
                    targets.linuxMips32
-//                   ,
-//                   targets.androidNativeArm32,
-//                   targets.androidNativeArm64
         ]) {
             compilations.main.source(sourceSets.nativeCommonMain)
             compilations.test.source(sourceSets.nativeCommonTest)
@@ -164,4 +158,20 @@ allprojects {
             dependsOn 'publishLinuxMips32PublicationToMavenRepository'
         }
     }
-}
+
+    apply plugin: "org.jlleitschuh.gradle.ktlint"
+    ktlint {
+        version.set("0.37.2")
+        enableExperimentalRules.set(true)
+        verbose.set(true)
+        filter {
+            exclude { it.file.path.contains("build/") }
+        }
+    }
+
+    afterEvaluate {
+        tasks.named("check").configure {
+            dependsOn(tasks.getByName("ktlintCheck"))
+        }
+    }
+}

.idea/inspectionProfiles/profiles_settings.xml

@@ -16,10 +16,9 @@ expect val isMultithreaded: Boolean
  * you want.
  */
 val <T> T.isNativeFrozen: Boolean
-get() = !isNative || isFrozen
-
+    get() = !isNative || isFrozen
 
 /**
  * Determine if object is frozen. Will return false on non-native platforms.
  */
-expect val <T> T.isFrozen: Boolean
+expect val <T> T.isFrozen: Boolean