Skip to content

Commit da48bc1

Browse files
Merge pull request #80 from OpenFuturePlatform/key-master-fix
Key master fix
2 parents 1452fef + d4e8f0f commit da48bc1

40 files changed

+4836
-42
lines changed

build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ sourceSets {
7272
main.resources.srcDirs += 'frontend/build/resources'
7373
main.resources.srcDirs += 'widget/build/resources'
7474
main.resources.srcDirs += 'tracker/build/resources'
75+
main.resources.srcDirs += 'payment-chooser/build/resources'
7576
}
7677

7778
// Kotlin
@@ -112,4 +113,5 @@ check.dependsOn jacocoTestReport
112113
// Front
113114
processResources.dependsOn(':frontend:assemble')
114115
processResources.dependsOn(':widget:assemble')
115-
processResources.dependsOn(':tracker:assemble')
116+
processResources.dependsOn(':tracker:assemble')
117+
processResources.dependsOn(':payment-chooser:assemble')

payment-chooser/build.gradle

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
plugins {
2+
id("com.github.node-gradle.node") version "2.2.0"
3+
}
4+
5+
apply plugin: 'com.github.node-gradle.node'
6+
7+
node {
8+
version = '12.20.1'
9+
download = true
10+
}
11+
12+
task assemble(type: NpmTask) {
13+
args = ['run', 'build']
14+
}
15+
16+
assemble.doLast {
17+
println "Merging payment chooser"
18+
19+
def destinationDir = mkdir "$project.buildDir/resources"
20+
21+
// copying index.html
22+
copy {
23+
from project.buildDir
24+
include 'index.html'
25+
rename 'index.html', "payment-chooser.ftl"
26+
into "$destinationDir/templates"
27+
}
28+
// copying resources
29+
copy {
30+
from project.buildDir
31+
exclude 'index.html', 'resources'
32+
into "$destinationDir/static"
33+
}
34+
}
35+
36+
assemble.dependsOn npmInstall
37+
npmInstall.dependsOn npmSetup
38+
npmSetup.dependsOn nodeSetup
Loading
Loading
Loading

payment-chooser/build/resources/static/static/js/payment-chooser.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

payment-chooser/build/resources/static/static/js/payment-chooser.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Loading
Loading
Loading
875 Bytes
Loading
6.14 KB
Loading
23.7 KB
Loading

0 commit comments

Comments
 (0)