Skip to content

Commit 53923d2

Browse files
committed
some edits to build files
1 parent 5f08aa0 commit 53923d2

File tree

3 files changed

+25
-21
lines changed

3 files changed

+25
-21
lines changed

build.gradle

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ allprojects {
3333
ext.toolsLibVersion = '26.0.0-dev'
3434

3535
Properties modeProperties = new Properties()
36-
modeProperties.load(project.rootProject.file('mode/mode.properties').newDataInputStream())
37-
ext.modeVersion = modeProperties.getProperty('prettyVersion')
36+
modeProperties.load(project.rootProject.file("mode/mode.properties").newDataInputStream())
37+
ext.modeVersion = modeProperties.getProperty("prettyVersion")
3838

3939
Properties vrProperties = new Properties()
40-
vrProperties.load(project.rootProject.file('mode/libraries/vr/library.properties').newDataInputStream())
41-
ext.vrLibVersion = vrProperties.getProperty('prettyVersion')
40+
vrProperties.load(project.rootProject.file("mode/libraries/vr/library.properties").newDataInputStream())
41+
ext.vrLibVersion = vrProperties.getProperty("prettyVersion")
4242

4343
Properties localProperties = new Properties()
44-
localProperties.load(project.rootProject.file('local.properties').newDataInputStream())
45-
def sdkDir = localProperties.getProperty('sdk.dir')
44+
localProperties.load(project.rootProject.file("local.properties").newDataInputStream())
45+
def sdkDir = localProperties.getProperty("sdk.dir")
4646
ext.androidPlatformPath = "${sdkDir}/platforms/android-${targetSdkVersion}"
4747
ext.androidToolsLibPath = "${sdkDir}/tools/lib"
4848

@@ -67,38 +67,38 @@ clean.doFirst {
6767
task dist {
6868
dependsOn subprojects.build
6969
doLast {
70-
def root = "$buildDir/zip/AndroidMode"
70+
def root = "${buildDir}/zip/AndroidMode"
7171

7272
// Copy assets to build dir
73-
FileUtils.copyDirectory(file("mode/templates"), file("$root/templates"))
74-
FileUtils.copyDirectory(file("mode/examples"), file("$root/examples"))
75-
FileUtils.copyDirectory(file("mode/icons"), file("$root/icons"))
76-
FileUtils.copyDirectory(file("mode/mode"), file("$root/mode"))
77-
FileUtils.copyDirectory(file("mode/theme"), file("$root/theme"))
73+
FileUtils.copyDirectory(file("mode/templates"), file("${root}/templates"))
74+
FileUtils.copyDirectory(file("mode/examples"), file("${root}/examples"))
75+
FileUtils.copyDirectory(file("mode/icons"), file("${root}/icons"))
76+
FileUtils.copyDirectory(file("mode/mode"), file("${root}/mode"))
77+
FileUtils.copyDirectory(file("mode/theme"), file("${root}/theme"))
7878

7979
Files.copy(file("mode/processing-core.zip").toPath(),
80-
file("$root/processing-core.zip").toPath(), REPLACE_EXISTING);
80+
file("${root}/processing-core.zip").toPath(), REPLACE_EXISTING);
8181

8282
Files.copy(file("mode/mode.properties").toPath(),
83-
file("$root/mode.properties").toPath(), REPLACE_EXISTING);
83+
file("${root}/mode.properties").toPath(), REPLACE_EXISTING);
8484

8585
FileUtils.copyDirectory(file("mode/tools/SDKUpdater/tool"),
86-
file("$root/tools/SDKUpdater/tool"))
86+
file("${root}/tools/SDKUpdater/tool"))
8787
FileUtils.copyDirectory(file("mode/tools/SDKUpdater/src"),
88-
file("$root/tools/SDKUpdater/src"))
88+
file("${root}/tools/SDKUpdater/src"))
8989

9090
FileUtils.copyDirectory(file("mode/libraries/vr/examples"),
91-
file("$root/libraries/vr/examples"))
91+
file("${root}/libraries/vr/examples"))
9292
FileUtils.copyDirectory(file("mode/libraries/vr/library"),
93-
file("$root/libraries/vr/library"))
93+
file("${root}/libraries/vr/library"))
9494
FileUtils.copyDirectory(file("mode/libraries/vr/src"),
95-
file("$root/libraries/vr/src"))
95+
file("${root}/libraries/vr/src"))
9696
Files.copy(file("mode/libraries/vr/library.properties").toPath(),
97-
file("$root/libraries/vr/library.properties").toPath(), REPLACE_EXISTING);
97+
file("${root}/libraries/vr/library.properties").toPath(), REPLACE_EXISTING);
9898

9999
File distFolder = file("dist");
100100
distFolder.mkdirs();
101-
ZipUtil.pack(file("$buildDir/zip"), new File("dist/AndroidMode.zip"));
101+
ZipUtil.pack(file("${buildDir}/zip"), new File("dist/AndroidMode.zip"));
102102
Files.copy(file("mode/mode.properties").toPath(),
103103
file("dist/AndroidMode.txt").toPath(), REPLACE_EXISTING);
104104
}

core/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ class ClassesJarArtifactTransform extends ArtifactTransform {
7575
}
7676

7777
task createPom {
78+
// The compile configuration should be replaced by implementation eventually:
79+
// https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration#new_configurations
7880
pom {
7981
project {
8082
groupId "org.p5android"

mode/libraries/vr/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ class ClassesJarArtifactTransform extends ArtifactTransform {
8181
}
8282

8383
task createPom {
84+
// The compile configuration should be replaced by implementation eventually:
85+
// https://developer.android.com/studio/build/gradle-plugin-3-0-0-migration#new_configurations
8486
pom {
8587
project {
8688
groupId "org.p5android"

0 commit comments

Comments
 (0)