skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Ensure maven.lyndir.com is accessed securely.

Browse Source
This commit is contained in:
Maarten Billemont 2018-06-10 19:11:22 -04:00
parent ed6c32811c
commit 1d06dd65ed
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/build.gradle
View File

@ -32,6 +32,6 @@ subprojects {
google() google()
jcenter() jcenter()
mavenCentral() mavenCentral()
maven { url 'http://maven.lyndir.com' } maven { url 'https://maven.lyndir.com' }
} }
} }

4
platform-independent/c/core/build.gradle
View File

@ -26,8 +26,6 @@ library {
// Reconfigure the toolchain from C++ to C. // Reconfigure the toolchain from C++ to C.
toolChains { toolChains {
withType( GccCompatibleToolChain ) { withType( GccCompatibleToolChain ) {
//TODO: Cross-compiling, blocked by: https://github.com/gradle/gradle-native/issues/169
//setTargets( "arm", "arm64", "x86-64", "x86" )
eachPlatform { eachPlatform {
cppCompiler.withArguments { addAll( ["-x", "c", "-std=c11", "-Werror", "-DMPW_SODIUM=1"] ) } cppCompiler.withArguments { addAll( ["-x", "c", "-std=c11", "-Werror", "-DMPW_SODIUM=1"] ) }
} }
@ -38,11 +36,11 @@ library {
} }
// Cross-compile for these host platforms. // Cross-compile for these host platforms.
// TODO: Cross-compiling, blocked by: https://github.com/gradle/gradle-native/issues/169 - CppLibraryPlugin.java:163
operatingSystems.set( [objects.named( OperatingSystemFamily, OperatingSystemFamily.WINDOWS ), operatingSystems.set( [objects.named( OperatingSystemFamily, OperatingSystemFamily.WINDOWS ),
objects.named( OperatingSystemFamily, OperatingSystemFamily.LINUX ), objects.named( OperatingSystemFamily, OperatingSystemFamily.LINUX ),
objects.named( OperatingSystemFamily, OperatingSystemFamily.MAC_OS )] ) objects.named( OperatingSystemFamily, OperatingSystemFamily.MAC_OS )] )
//
binaries.configureEach { binaries.configureEach {
// Resolve a standard name for the platform. // Resolve a standard name for the platform.
def platform = standardOperatingSystem( targetPlatform ) def platform = standardOperatingSystem( targetPlatform )