isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update kotlin gradle plugin; add js target

Browse Source
pull/498/head
Alinson S. Xavier 7 years ago
parent 1abc041d87
commit fe219b5296
6 changed files with 60 additions and 68 deletions
Show Stats Download Patch File Download Diff File

67
core/build.gradle
Unescape View File

@ -17,34 +17,23 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
buildscript { plugins {
repositories { id 'kotlin-multiplatform' version '1.3.21'
google()
jcenter()
maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
}
dependencies {
classpath "com.android.tools.build:gradle:3.2.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
}
} }
allprojects {
repositories { repositories {
google() mavenCentral()
jcenter()
maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
} }
}
apply plugin:"kotlin-multiplatform"
kotlin { kotlin {
jvm()
js()
targets { targets {
def iosPreset = System.getenv('SDK_NAME')?.startsWith("iphoneos") ? presets.iosArm64 : presets.iosX64 def sdkName = System.getenv('SDK_NAME')
fromPreset(presets.jvm, 'jvm') def isIphone = sdkName?.startsWith("iphoneos")
fromPreset(iosPreset, 'iOS') { def iosPreset = isIphone ? presets.iosArm64 : presets.iosX64
fromPreset(iosPreset, 'ios') {
compilations.main.outputKinds('FRAMEWORK') compilations.main.outputKinds('FRAMEWORK')
} }
} }
@ -52,43 +41,41 @@ kotlin {
sourceSets { sourceSets {
commonMain { commonMain {
dependencies { dependencies {
implementation 'org.jetbrains.kotlin:kotlin-stdlib-common' implementation kotlin('stdlib-common')
} }
} }
commonTest { commonTest {
dependencies { dependencies {
implementation 'org.jetbrains.kotlin:kotlin-test-common' implementation kotlin('test-common')
implementation 'org.jetbrains.kotlin:kotlin-test-annotations-common' implementation kotlin('test-annotations-common')
} }
} }
jvmMain { jvmMain {
dependencies { dependencies {
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' implementation kotlin('stdlib-jdk8')
} }
} }
jvmTest { jvmTest {
dependencies { dependencies {
implementation 'org.jetbrains.kotlin:kotlin-test' implementation kotlin('test')
implementation 'org.jetbrains.kotlin:kotlin-test-junit' implementation kotlin('test-junit')
implementation 'org.xerial:sqlite-jdbc:3.25.2' implementation 'org.xerial:sqlite-jdbc:3.25.2'
} }
} }
}
task iosTest { jsMain {
dependsOn 'linkTestDebugExecutableIOS' dependencies {
group = JavaBasePlugin.VERIFICATION_GROUP implementation kotlin('stdlib-js')
description = "Runs tests for target 'ios' on an iOS simulator"
doLast {
def binary = kotlin.targets.iOS.compilations.test.getBinary('EXECUTABLE', 'DEBUG')
exec {
commandLine 'xcrun', 'simctl', 'spawn', "iPhone 8", binary.absolutePath
} }
} }
jsTest {
dependencies {
implementation kotlin('test-js')
}
} }
} }
configurations {
compileClasspath
} }

3
core/gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -1,5 +1,6 @@
#Sun Apr 07 10:31:43 CDT 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip

9
core/settings.gradle
Unescape View File

@ -0,0 +1,9 @@
pluginManagement {
resolutionStrategy {
eachPlugin {
if (requested.id.id == "kotlin-multiplatform") {
useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
}
}
}
}

9
core/src/commonTest/kotlin/org/isoron/platform/io/StringsTest.kt → core/src/jsMain/kotlin/org/isoron/platform/io/sprintf.kt
Unescape View File

@ -19,11 +19,6 @@
package org.isoron.platform.io package org.isoron.platform.io
import kotlin.test.* actual fun sprintf(format: String, vararg args: Any?): String {
TODO()
class StringsTest {
@Test
fun testSprintf() {
assertEquals("Number 004", sprintf("Number %03d", 4))
}
} }

2
ios/Application/BridgingHeader.h
Unescape View File

@ -17,4 +17,4 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#import <core.h> #import <main.h>

34
ios/uhabits.xcodeproj/project.pbxproj
Unescape View File

@ -19,9 +19,9 @@
00C0C6BD22465F65003D8AF0 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 00C0C6BA22465F65003D8AF0 /* fonts */; }; 00C0C6BD22465F65003D8AF0 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 00C0C6BA22465F65003D8AF0 /* fonts */; };
00C0C6BE22465F65003D8AF0 /* databases in Resources */ = {isa = PBXBuildFile; fileRef = 00C0C6BB22465F65003D8AF0 /* databases */; }; 00C0C6BE22465F65003D8AF0 /* databases in Resources */ = {isa = PBXBuildFile; fileRef = 00C0C6BB22465F65003D8AF0 /* databases */; };
00C0C6BF22465F65003D8AF0 /* migrations in Resources */ = {isa = PBXBuildFile; fileRef = 00C0C6BC22465F65003D8AF0 /* migrations */; }; 00C0C6BF22465F65003D8AF0 /* migrations in Resources */ = {isa = PBXBuildFile; fileRef = 00C0C6BC22465F65003D8AF0 /* migrations */; };
00C0C6CA2246E543003D8AF0 /* core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C0C6C92246E543003D8AF0 /* core.framework */; }; 00C0C6CA2246E543003D8AF0 /* main.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C0C6C92246E543003D8AF0 /* main.framework */; };
00C0C6CB2246E543003D8AF0 /* core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C0C6C92246E543003D8AF0 /* core.framework */; }; 00C0C6CB2246E543003D8AF0 /* main.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C0C6C92246E543003D8AF0 /* main.framework */; };
00C0C6CC2246E550003D8AF0 /* core.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 00C0C6C92246E543003D8AF0 /* core.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 00C0C6CC2246E550003D8AF0 /* main.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 00C0C6C92246E543003D8AF0 /* main.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
00C0C6CE2246EFB3003D8AF0 /* IosExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6CD2246EFB3003D8AF0 /* IosExtensions.swift */; }; 00C0C6CE2246EFB3003D8AF0 /* IosExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6CD2246EFB3003D8AF0 /* IosExtensions.swift */; };
00C0C6D122470705003D8AF0 /* IosCanvas.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6D022470705003D8AF0 /* IosCanvas.swift */; }; 00C0C6D122470705003D8AF0 /* IosCanvas.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6D022470705003D8AF0 /* IosCanvas.swift */; };
00C0C6D92247DC13003D8AF0 /* IosCanvasTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6D82247DC13003D8AF0 /* IosCanvasTest.swift */; }; 00C0C6D92247DC13003D8AF0 /* IosCanvasTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00C0C6D82247DC13003D8AF0 /* IosCanvasTest.swift */; };
@ -49,7 +49,7 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
00C0C6CC2246E550003D8AF0 /* core.framework in Embed Frameworks */, 00C0C6CC2246E550003D8AF0 /* main.framework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
@ -74,7 +74,7 @@
00C0C6BA22465F65003D8AF0 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = fonts; sourceTree = "<group>"; }; 00C0C6BA22465F65003D8AF0 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = fonts; sourceTree = "<group>"; };
00C0C6BB22465F65003D8AF0 /* databases */ = {isa = PBXFileReference; lastKnownFileType = folder; path = databases; sourceTree = "<group>"; }; 00C0C6BB22465F65003D8AF0 /* databases */ = {isa = PBXFileReference; lastKnownFileType = folder; path = databases; sourceTree = "<group>"; };
00C0C6BC22465F65003D8AF0 /* migrations */ = {isa = PBXFileReference; lastKnownFileType = folder; path = migrations; sourceTree = "<group>"; }; 00C0C6BC22465F65003D8AF0 /* migrations */ = {isa = PBXFileReference; lastKnownFileType = folder; path = migrations; sourceTree = "<group>"; };
00C0C6C92246E543003D8AF0 /* core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = core.framework; path = ../core/build/bin/iOS/main/debug/framework/core.framework; sourceTree = "<group>"; }; 00C0C6C92246E543003D8AF0 /* main.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = main.framework; path = ../core/build/bin/ios/mainDebugFramework/main.framework; sourceTree = "<group>"; };
00C0C6CD2246EFB3003D8AF0 /* IosExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosExtensions.swift; sourceTree = "<group>"; }; 00C0C6CD2246EFB3003D8AF0 /* IosExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosExtensions.swift; sourceTree = "<group>"; };
00C0C6D022470705003D8AF0 /* IosCanvas.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosCanvas.swift; sourceTree = "<group>"; }; 00C0C6D022470705003D8AF0 /* IosCanvas.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosCanvas.swift; sourceTree = "<group>"; };
00C0C6D82247DC13003D8AF0 /* IosCanvasTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosCanvasTest.swift; sourceTree = "<group>"; }; 00C0C6D82247DC13003D8AF0 /* IosCanvasTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IosCanvasTest.swift; sourceTree = "<group>"; };
@ -90,7 +90,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
00C0C6CA2246E543003D8AF0 /* core.framework in Frameworks */, 00C0C6CA2246E543003D8AF0 /* main.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -98,7 +98,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
00C0C6CB2246E543003D8AF0 /* core.framework in Frameworks */, 00C0C6CB2246E543003D8AF0 /* main.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -162,7 +162,7 @@
00C0C6B0224658CD003D8AF0 /* Frameworks */ = { 00C0C6B0224658CD003D8AF0 /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
00C0C6C92246E543003D8AF0 /* core.framework */, 00C0C6C92246E543003D8AF0 /* main.framework */,
); );
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
@ -319,7 +319,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "cd ../core\n./gradlew linkIOS\n"; shellScript = "cd ../core\n./gradlew linkMainIos\n";
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
@ -493,10 +493,10 @@
DEVELOPMENT_TEAM = R5YTHGE3PS; DEVELOPMENT_TEAM = R5YTHGE3PS;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(PROJECT_DIR)/../core/build/bin/iOS/main/debug/framework/", "$(PROJECT_DIR)/../core/build/bin/ios/mainDebugFramework/",
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/iOS/main/debug/framework/core.framework/Headers/"; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/ios/mainDebugFramework/main.framework/Headers/";
INFOPLIST_FILE = Application/Info.plist; INFOPLIST_FILE = Application/Info.plist;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -520,10 +520,10 @@
DEVELOPMENT_TEAM = R5YTHGE3PS; DEVELOPMENT_TEAM = R5YTHGE3PS;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(PROJECT_DIR)/../core/build/bin/iOS/main/debug/framework/", "$(PROJECT_DIR)/../core/build/bin/ios/mainDebugFramework/",
"$(PROJECT_DIR)", "$(PROJECT_DIR)",
); );
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/iOS/main/debug/framework/core.framework/Headers/"; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/ios/mainDebugFramework/main.framework/Headers/";
INFOPLIST_FILE = Application/Info.plist; INFOPLIST_FILE = Application/Info.plist;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -545,8 +545,8 @@
BUNDLE_LOADER = "$(TEST_HOST)"; BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = R5YTHGE3PS; DEVELOPMENT_TEAM = R5YTHGE3PS;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/iOS/main/debug/framework/"; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/ios/mainDebugFramework/";
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/iOS/main/debug/framework/core.framework/Headers/"; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/ios/mainDebugFramework/main.framework/Headers/";
INFOPLIST_FILE = Tests/Info.plist; INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -568,8 +568,8 @@
BUNDLE_LOADER = "$(TEST_HOST)"; BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = R5YTHGE3PS; DEVELOPMENT_TEAM = R5YTHGE3PS;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/iOS/main/debug/framework/"; FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/ios/mainDebugFramework/";
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/iOS/main/debug/framework/core.framework/Headers/"; HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/ios/mainDebugFramework/main.framework/Headers/";
INFOPLIST_FILE = Tests/Info.plist; INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",

Write Preview
Loading…
Cancel
Save