Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

Commit da5d4fb

Browse files
author
Sergey Mashkov
committed
Move examples to a separate directory, upgrade fullstack example
1 parent 165b502 commit da5d4fb

File tree

47 files changed

+194
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+194
-200
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ kotlinFrontend {
7272

7373
### complete example
7474

75-
See [test/build.gradle](test/build.gradle) for full example
75+
See [examples/frontend-only/build.gradle](examples/frontend-only/build.gradle) for full example
7676

7777
# Building and running
7878

@@ -146,7 +146,7 @@ config file is generated at `build/karma.conf.js`
146146

147147
Webpack provides ability to apply code changes on the fly with no page reload (if possible). For reference see [Webpack Hot Module Replacement documentation](https://webpack.js.org/concepts/hot-module-replacement/)
148148

149-
Webpack does a lot of work for you however to get it working well most likely you have to implement state save and restore functionality via webpack's API. See [HMR.kt](test/src/main/kotlin/test/hello/HMR.kt) for corresponding Kotlin external declarations for webpack API and [main.kt](test/src/main/kotlin/test/hello/main.kt) for sample save/load.
149+
Webpack does a lot of work for you however to get it working well most likely you have to implement state save and restore functionality via webpack's API. See [HMR.kt](examples/frontend-only/src/main/kotlin/test/hello/HMR.kt) for corresponding Kotlin external declarations for webpack API and [main.kt](examples/frontend-only/src/main/kotlin/test/hello/main.kt) for sample save/load.
150150

151151
Briefly at module load accept HMR feature and listen for disposal
152152

File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,84 @@
1-
@if "%DEBUG%" == "" @echo off
2-
@rem ##########################################################################
3-
@rem
4-
@rem Gradle startup script for Windows
5-
@rem
6-
@rem ##########################################################################
7-
8-
@rem Set local scope for the variables with windows NT shell
9-
if "%OS%"=="Windows_NT" setlocal
10-
11-
set DIRNAME=%~dp0
12-
if "%DIRNAME%" == "" set DIRNAME=.
13-
set APP_BASE_NAME=%~n0
14-
set APP_HOME=%DIRNAME%
15-
16-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
18-
19-
@rem Find java.exe
20-
if defined JAVA_HOME goto findJavaFromJavaHome
21-
22-
set JAVA_EXE=java.exe
23-
%JAVA_EXE% -version >NUL 2>&1
24-
if "%ERRORLEVEL%" == "0" goto init
25-
26-
echo.
27-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28-
echo.
29-
echo Please set the JAVA_HOME variable in your environment to match the
30-
echo location of your Java installation.
31-
32-
goto fail
33-
34-
:findJavaFromJavaHome
35-
set JAVA_HOME=%JAVA_HOME:"=%
36-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37-
38-
if exist "%JAVA_EXE%" goto init
39-
40-
echo.
41-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42-
echo.
43-
echo Please set the JAVA_HOME variable in your environment to match the
44-
echo location of your Java installation.
45-
46-
goto fail
47-
48-
:init
49-
@rem Get command-line arguments, handling Windows variants
50-
51-
if not "%OS%" == "Windows_NT" goto win9xME_args
52-
53-
:win9xME_args
54-
@rem Slurp the command line arguments.
55-
set CMD_LINE_ARGS=
56-
set _SKIP=2
57-
58-
:win9xME_args_slurp
59-
if "x%~1" == "x" goto execute
60-
61-
set CMD_LINE_ARGS=%*
62-
63-
:execute
64-
@rem Setup the command line
65-
66-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67-
68-
@rem Execute Gradle
69-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70-
71-
:end
72-
@rem End local scope for the variables with windows NT shell
73-
if "%ERRORLEVEL%"=="0" goto mainEnd
74-
75-
:fail
76-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77-
rem the _cmd.exe /c_ return code!
78-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79-
exit /b 1
80-
81-
:mainEnd
82-
if "%OS%"=="Windows_NT" endlocal
83-
84-
:omega
1+
@if "%DEBUG%" == "" @echo off
2+
@rem ##########################################################################
3+
@rem
4+
@rem Gradle startup script for Windows
5+
@rem
6+
@rem ##########################################################################
7+
8+
@rem Set local scope for the variables with windows NT shell
9+
if "%OS%"=="Windows_NT" setlocal
10+
11+
set DIRNAME=%~dp0
12+
if "%DIRNAME%" == "" set DIRNAME=.
13+
set APP_BASE_NAME=%~n0
14+
set APP_HOME=%DIRNAME%
15+
16+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17+
set DEFAULT_JVM_OPTS=
18+
19+
@rem Find java.exe
20+
if defined JAVA_HOME goto findJavaFromJavaHome
21+
22+
set JAVA_EXE=java.exe
23+
%JAVA_EXE% -version >NUL 2>&1
24+
if "%ERRORLEVEL%" == "0" goto init
25+
26+
echo.
27+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28+
echo.
29+
echo Please set the JAVA_HOME variable in your environment to match the
30+
echo location of your Java installation.
31+
32+
goto fail
33+
34+
:findJavaFromJavaHome
35+
set JAVA_HOME=%JAVA_HOME:"=%
36+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37+
38+
if exist "%JAVA_EXE%" goto init
39+
40+
echo.
41+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42+
echo.
43+
echo Please set the JAVA_HOME variable in your environment to match the
44+
echo location of your Java installation.
45+
46+
goto fail
47+
48+
:init
49+
@rem Get command-line arguments, handling Windows variants
50+
51+
if not "%OS%" == "Windows_NT" goto win9xME_args
52+
53+
:win9xME_args
54+
@rem Slurp the command line arguments.
55+
set CMD_LINE_ARGS=
56+
set _SKIP=2
57+
58+
:win9xME_args_slurp
59+
if "x%~1" == "x" goto execute
60+
61+
set CMD_LINE_ARGS=%*
62+
63+
:execute
64+
@rem Setup the command line
65+
66+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67+
68+
@rem Execute Gradle
69+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70+
71+
:end
72+
@rem End local scope for the variables with windows NT shell
73+
if "%ERRORLEVEL%"=="0" goto mainEnd
74+
75+
:fail
76+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77+
rem the _cmd.exe /c_ return code!
78+
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79+
exit /b 1
80+
81+
:mainEnd
82+
if "%OS%"=="Windows_NT" endlocal
83+
84+
:omega
File renamed without changes.

full-stack-example/build.gradle renamed to examples/full-stack-example/build.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@ group 'org.jetbrains.kotlin.examples'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.0.6'
5+
ext.kotlin_version = '1.1.0'
66

77
repositories {
88
jcenter()
9-
mavenLocal()
9+
maven { url 'https://jitpack.io' }
1010
}
1111
dependencies {
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13-
classpath "org.jetbrains.kotlin:kotlin-frontend:0.0.1-SNAPSHOT"
13+
classpath "com.github.cy6erGn0m:kotlin-frontend-plugin:568610baa1"
1414
}
1515
}
1616

1717
subprojects { p ->
1818
p.repositories {
19-
mavenLocal()
2019
jcenter()
20+
maven { url 'https://jitpack.io' }
2121
maven { url "http://dl.bintray.com/kotlin/ktor" }
2222
}
2323
}
2424

2525
repositories {
2626
jcenter()
27+
maven { url 'https://jitpack.io' }
2728
maven { url "http://dl.bintray.com/kotlin/ktor" }
2829
}
2930

full-stack-example/frontend/build.gradle renamed to examples/full-stack-example/frontend/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ kotlinFrontend {
2222
}
2323

2424
dependencies {
25-
compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
25+
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
26+
compile "org.jetbrains.kotlin:kotlin-test-js:$kotlin_version"
2627
}
2728

2829
compileKotlin2Js {
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package test.hello
22

3-
@native val module: Module
3+
external val module: Module
44

5-
@native interface Module {
5+
external interface Module {
66
val hot: Hot?
77
}
88

9-
@native interface Hot {
9+
external interface Hot {
1010
val data: dynamic
1111

1212
fun accept()
@@ -16,5 +16,4 @@ package test.hello
1616
fun dispose(callback: (data: dynamic) -> Unit)
1717
}
1818

19-
@native
20-
fun require(name: String): dynamic
19+
external fun require(name: String): dynamic
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#org.gradle.jvmargs=-XX:+UnlockCommercialFeatures -XX:+FlightRecorder
2-
org.gradle.debug=true
2+
#org.gradle.debug=true
File renamed without changes.

0 commit comments

Comments
 (0)