diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index 0243837..0000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,2 +0,0 @@ -[build] -target-dir = "Binaries" diff --git a/.gitignore b/.gitignore index 2b39730..e1c082d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,8 @@ -# Binary Files - -Binaries/ -Intermediate/ - -# Cargo Files - -Cargo.lock - -# Packaged Artifacts - -Release/ - -# Idea and Gradle Files - -.idea/ +.bloop/ .gradle/ - +.idea/ +.metals/ +bin/ build/ -libs/ -jniLibs/ - -local.properties - -# Java Extension Files - -.project -.classpath - -bin/ - -.settings/ - -# Mac OSX - .DS_Store diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..050505c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} diff --git a/Bootstrap.ps1 b/Bootstrap.ps1 deleted file mode 100755 index 9095981..0000000 --- a/Bootstrap.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env pwsh - -$env:TRIBUFU_SDK_PATH="D:/Guilherme/Projects/DevKit/Publish" diff --git a/Bootstrap.sh b/Bootstrap.sh deleted file mode 100755 index d8f6faf..0000000 --- a/Bootstrap.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env sh - -TRIBUFU_SDK_PATH="/home/guilherme/Projects/DevKit/Publish" diff --git a/Cargo.toml b/Cargo.toml deleted file mode 100644 index ea9fd78..0000000 --- a/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "tribufu-jni" -version = "0.0.1" -description = "JNI bindings to TribuFu SDK" -repository = "https://github.com/TribuFu/SDK" -authors = ["TribuFu "] -license = "Apache-2.0" -edition = "2018" -publish = false - -[lib] -name="TribuFu_Jni" -crate-type = ["cdylib", "rlib"] -path = "Source/lib.rs" - -[dependencies] -tribufu = { path = "../DevKit.Rs" } -jni = "0.19.0" diff --git a/Scripts/Build.ps1 b/Scripts/Build.ps1 deleted file mode 100644 index d4a7663..0000000 --- a/Scripts/Build.ps1 +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env pwsh - -# Windows - -echo "Building for Windows (x86_64)" -cargo build --target x86_64-pc-windows-msvc $args - -echo "Building for Windows (i686)" -cargo build --target i686-pc-windows-msvc $args - -echo "Building for Windows (aarch64)" -cargo build --target aarch64-pc-windows-msvc $args - -# Mac - -echo "Building for Mac (x86_64)" -docker run --rm ` - -v ${pwd}:/Projects/DevKit ` - -v ${home}/.cargo/registry:/usr/local/cargo/registry ` - -w /Projects/DevKit alnilam/mac ` - cargo build --color always --target x86_64-apple-darwin $args - -echo "Building for Mac (aarch64)" -docker run --rm ` - -v ${pwd}:/Projects/DevKit ` - -v ${home}/.cargo/registry:/usr/local/cargo/registry ` - -w /Projects/DevKit alnilam/mac ` - cargo build --color always --target aarch64-apple-darwin $args - -# Linux - -echo "Building for Linux (x86_64)" -docker run --rm ` - -v ${pwd}:/Projects/DevKit ` - -v ${home}/.cargo/registry:/usr/local/cargo/registry ` - -w /Projects/DevKit alnilam/linux:x86_64 ` - cargo build --color always --target x86_64-unknown-linux-gnu $args - -echo "Building for Linux (i686)" -docker run --rm ` - -v ${pwd}:/Projects/DevKit ` - -v ${home}/.cargo/registry:/usr/local/cargo/registry ` - -w /Projects/DevKit alnilam/linux:i686 ` - cargo build --color always --target i686-unknown-linux-gnu $args - -echo "Building for Linux (aarch64)" -docker run --rm ` - -v ${pwd}:/Projects/DevKit ` - -v ${home}/.cargo/registry:/usr/local/cargo/registry ` - -w /Projects/DevKit alnilam/linux:aarch64 ` - cargo build --color always --target aarch64-unknown-linux-gnu $args - -# Android - -cargo ndk -t armeabi-v7a -t arm64-v8a -t x86 -t x86_64 build diff --git a/Scripts/Check.ps1 b/Scripts/Check.ps1 deleted file mode 100644 index 9a8654f..0000000 --- a/Scripts/Check.ps1 +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env sh - -# Windows - -echo "Building for Windows (x86_64)" -cargo check --target x86_64-pc-windows-msvc - -echo "Building for Windows (i686)" -cargo check --target i686-pc-windows-msvc - -echo "Building for Windows (aarch64)" -cargo check --target aarch64-pc-windows-msvc - -# Mac - -echo "Building for Mac (x86_64)" -cargo check --target x86_64-apple-darwin - -echo "Building for Mac (aarch64)" -cargo check --target aarch64-apple-darwin - -# Linux - -echo "Building for Linux (x86_64)" -cargo check --target x86_64-unknown-linux-gnu - -echo "Building for Linux (i686)" -cargo check --target i686-unknown-linux-gnu - -echo "Building for Linux (aarch64)" -cargo check --target aarch64-unknown-linux-gnu - -# Android - -echo "Building for Android (x86_64)" -cargo check --target x86_64-linux-android - -echo "Building for Android (i686)" -cargo check --target i686-linux-android - -echo "Building for Android (aarch64)" -cargo check --target aarch64-linux-android - -echo "Building for Android (armv7)" -cargo check --target armv7-linux-androideabi diff --git a/Scripts/Package.ps1 b/Scripts/Package.ps1 deleted file mode 100755 index 3261a3c..0000000 --- a/Scripts/Package.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env pwsh - -if ($IsWindows) -{ - python ./Scripts/Package.py -} -else -{ - python3 ./Scripts/Package.py -} diff --git a/Scripts/Package.py b/Scripts/Package.py deleted file mode 100644 index 1496dab..0000000 --- a/Scripts/Package.py +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env python3 - -import os -import subprocess -import platform -import shutil - -from pathlib import Path - -Path("./Release").mkdir(parents=True, exist_ok=True) - -if os.path.exists("./Release/Windows"): - shutil.rmtree("./Release/Windows") - -Path("./Release/Windows").mkdir(parents=True, exist_ok=True) - -if os.path.exists("./Release/Mac"): - shutil.rmtree("./Release/Mac") - -Path("./Release/Mac").mkdir(parents=True, exist_ok=True) - -if os.path.exists("./Release/Linux"): - shutil.rmtree("./Release/Linux") - -Path("./Release/Linux").mkdir(parents=True, exist_ok=True) - -print("Building Native Library") - -os.system("cargo build --release") - -# Windows - -if platform.system() == "Windows": - shutil.copy2("./Binaries/release/TribuFu_Jvm.dll", "./Release/Windows/TribuFu_Jvm.dll") - -# Mac - -elif platform.system() == "Mac": - shutil.copy2("./Binaries/release/libTribuFu_Jvm.dylib", "./Release/Windows/libTribuFu_Jvm.dylib") - -# Linux - -elif platform.system() == "Linux": - shutil.copy2("./Binaries/release/libTribuFu_Jvm.so", "./Release/Windows/libTribuFu_Jvm.so") - -# Android - -os.system("cargo ndk -t armeabi-v7a -t arm64-v8a -t x86 -t x86_64 build --release") - -Path("./android/src/main/jniLibs").mkdir(parents=True, exist_ok=True) -Path("./android/src/main/jniLibs/arm64-v8a").mkdir(parents=True, exist_ok=True) -Path("./android/src/main/jniLibs/armeabi-v7a").mkdir(parents=True, exist_ok=True) -Path("./android/src/main/jniLibs/x86_64").mkdir(parents=True, exist_ok=True) -Path("./android/src/main/jniLibs/x86").mkdir(parents=True, exist_ok=True) - -shutil.copy2("./Binaries/aarch64-linux-android/release/libTribuFu_Jvm.so", "./android/src/main/jniLibs/arm64-v8a/libTribuFu_Jvm.so") -shutil.copy2("./Binaries/armv7-linux-androideabi/release/libTribuFu_Jvm.so", "./android/src/main/jniLibs/armeabi-v7a/libTribuFu_Jvm.so" ) -shutil.copy2("./Binaries/x86_64-linux-android/release/libTribuFu_Jvm.so", "./android/src/main/jniLibs/x86_64/libTribuFu_Jvm.so") -shutil.copy2("./Binaries/i686-linux-android/release/libTribuFu_Jvm.so", "./android/src/main/jniLibs/x86/libTribuFu_Jvm.so") - -print("Building JVM Library") - -if platform.system() == "Windows": - subprocess.run("gradlew.bat :library:build") - subprocess.run("gradlew.bat :library:jar") -else: - subprocess.run("./gradlew :library:build") - subprocess.run("./gradlew :library:jar") - -shutil.copy2("./library/build/libs/library-0.0.1.jar", "./Release/TribuFu.jar") - -print("Building Android Library") - -Path("./android/libs").mkdir(parents=True, exist_ok=True) - -shutil.copy2("./Release/TribuFu.jar", "./android/libs/TribuFu.jar") - -if platform.system() == "Windows": - subprocess.run("gradlew.bat :android:build") -else: - subprocess.run("./gradlew :android:build") - -shutil.copy2("./android/build/outputs/aar/android-release.aar", "./Release/TribuFu.aar") diff --git a/Source/lib.rs b/Source/lib.rs deleted file mode 100644 index 6796f33..0000000 --- a/Source/lib.rs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) TribuFu. All Rights Reserved. - -//! JNI bindings to TribuFu SDK. - -#![allow(non_snake_case)] - -use jni::objects::{JClass, JString}; -use jni::sys::jstring; -use jni::JNIEnv; -use std::ffi::{CStr, CString}; - -#[no_mangle] -pub extern "system" fn Java_com_tribufu_sdk_TribuFu_getVersion( - env: JNIEnv, - _class: JClass, - input: JString, -) -> jstring { - // First, we have to get the string out of Java. Check out the `strings` - // module for more info on how this works. - let input = CString::from(unsafe { CStr::from_ptr(env.get_string(input).unwrap().as_ptr()) }); - - // Then we have to create a new Java string to return. Again, more info - // in the `strings` module. - let output = env.new_string(input.to_str().unwrap()).unwrap(); - - // Finally, extract the raw pointer to return. - return output.into_inner(); -} diff --git a/android/build.gradle b/android/build.gradle deleted file mode 100644 index c4bc308..0000000 --- a/android/build.gradle +++ /dev/null @@ -1,49 +0,0 @@ -plugins { - id "com.android.library" - id "kotlin-android" -} - -android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" - - defaultConfig { - minSdkVersion 26 - targetSdkVersion 30 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles "consumer-rules.pro" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = "1.8" - } -} - -dependencies { - implementation files("libs/TribuFu.jar") - - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation "androidx.core:core-ktx:1.3.2" - implementation "androidx.appcompat:appcompat:1.2.0" - implementation "com.google.android.material:material:1.3.0" - - testImplementation "junit:junit:4.+" - - androidTestImplementation "androidx.test.ext:junit:1.1.2" - androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0" -} diff --git a/android/consumer-rules.pro b/android/consumer-rules.pro deleted file mode 100644 index e69de29..0000000 diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro deleted file mode 100644 index f1b4245..0000000 --- a/android/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/android/src/androidTest/java/com/tribufu/sdk/android/ExampleInstrumentedTest.kt b/android/src/androidTest/java/com/tribufu/sdk/android/ExampleInstrumentedTest.kt deleted file mode 100644 index 39ad9f9..0000000 --- a/android/src/androidTest/java/com/tribufu/sdk/android/ExampleInstrumentedTest.kt +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) TribuFu. All Rights Reserved. - -package com.tribufu.sdk.android - -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import org.junit.Assert.* -import org.junit.Test -import org.junit.runner.RunWith - -/** - * Instrumented test, which will execute on an Android device. - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -@RunWith(AndroidJUnit4::class) -class ExampleInstrumentedTest { - @Test - fun useAppContext() { - // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.tribufu.sdk.android.test", appContext.packageName) - } -} diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml deleted file mode 100644 index 86821f7..0000000 --- a/android/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/android/src/main/java/com/tribufu/sdk/android/TribuFu.kt b/android/src/main/java/com/tribufu/sdk/android/TribuFu.kt deleted file mode 100644 index c8c8c41..0000000 --- a/android/src/main/java/com/tribufu/sdk/android/TribuFu.kt +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright (c) TribuFu. All Rights Reserved. - -package com.tribufu.sdk.android - -class TribuFu {} diff --git a/android/src/test/java/com/tribufu/sdk/android/ExampleUnitTest.kt b/android/src/test/java/com/tribufu/sdk/android/ExampleUnitTest.kt deleted file mode 100644 index 60f8347..0000000 --- a/android/src/test/java/com/tribufu/sdk/android/ExampleUnitTest.kt +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) TribuFu. All Rights Reserved. - -package com.tribufu.sdk.android - -import org.junit.Assert.* -import org.junit.Test - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} diff --git a/build.gradle b/build.gradle index e0fdd81..9f4d8ba 100644 --- a/build.gradle +++ b/build.gradle @@ -1,27 +1,32 @@ -buildscript { - ext.kotlin_version = "1.4.31" - - repositories { - google() - jcenter() - } - - dependencies { - classpath "com.android.tools.build:gradle:4.1.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } +plugins { + id "scala" + id "java-library" } -allprojects { - repositories { - google() - jcenter() - } +group "com.tribufu.sdk" +version "1.0.0" + +repositories { + mavenCentral() + maven { url "https://mvn.tribufu.com/snapshots" } } -task clean(type: Delete) { - delete rootProject.buildDir +dependencies { + // Use Scala 2.13 in our library project + implementation "org.scala-lang:scala-library:2.13.9" + + // This dependency is used internally, and not exposed to consumers on their own compile classpath. + implementation "com.google.guava:guava:31.1-jre" + + // Use Scalatest for testing our library + testImplementation "junit:junit:4.13.2" + testImplementation "org.scalatest:scalatest_2.13:3.2.13" + testImplementation "org.scalatestplus:junit-4-13_2.13:3.2.2.0" + + // Need scala-xml at test runtime + testRuntimeOnly "org.scala-lang.modules:scala-xml_2.13:1.2.0" +} + +test { + useJUnitPlatform() } diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index cac7c68..0000000 --- a/gradle.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app"s APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..41d9927 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8711c99..41dfb87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue Jun 14 20:30:35 BRT 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/library/build.gradle b/library/build.gradle deleted file mode 100644 index 220f7cd..0000000 --- a/library/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -plugins { - // Apply the scala Plugin to add support for Scala. - id "scala" - - // Apply the java-library plugin for API and implementation separation. - id "java-library" -} - -group = "com.tribufu.sdk" -version = "0.0.1" - -repositories { - // Use Maven Central for resolving dependencies. - mavenCentral() -} - -dependencies { - // Use Scala 2.13 in our library project - implementation "org.scala-lang:scala-library:2.13.3" - - // This dependency is used internally, and not exposed to consumers on their own compile classpath. - implementation "com.google.guava:guava:30.0-jre" - - // Use Scalatest for testing our library - testImplementation "junit:junit:4.13.1" - testImplementation "org.scalatest:scalatest_2.13:3.2.3" - testImplementation "org.scalatestplus:junit-4-13_2.13:3.2.2.0" - - // Need scala-xml at test runtime - testRuntimeOnly "org.scala-lang.modules:scala-xml_2.13:1.2.0" - - // This dependency is exported to consumers, that is to say found on their compile classpath. - api "org.apache.commons:commons-math3:3.6.1" -} diff --git a/library/src/main/scala/com/tribufu/sdk/Library.scala b/library/src/main/scala/com/tribufu/sdk/Library.scala deleted file mode 100644 index 573ef8d..0000000 --- a/library/src/main/scala/com/tribufu/sdk/Library.scala +++ /dev/null @@ -1,449 +0,0 @@ -// Copyright (c) TribuFu. All Rights Reserved - -package com.tribufu.sdk - -class Library { - def alive(): Boolean = true -} - -/* -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -.................................................................................................... -*/ diff --git a/library/src/test/scala/library/kotlin/LibrarySuite.scala b/library/src/test/scala/library/kotlin/LibrarySuite.scala deleted file mode 100644 index 5f23bd6..0000000 --- a/library/src/test/scala/library/kotlin/LibrarySuite.scala +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) TribuFu. All Rights Reserved - -package com.tribufu.sdk - -import org.scalatest.funsuite.AnyFunSuite -import org.junit.runner.RunWith -import org.scalatestplus.junit.JUnitRunner - -@RunWith(classOf[JUnitRunner]) -class LibrarySuite extends AnyFunSuite { - test("someLibraryMethod is always true") { - def library = new Library() - assert(library.alive()) - } -} diff --git a/settings.gradle b/settings.gradle index f7fd9d4..fcbef66 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1 @@ -include("library") -//include("android") -rootProject.name = "DevKit" +rootProject.name = "TribuFu" diff --git a/src/main/scala/com/tribufu/sdk/Library.scala b/src/main/scala/com/tribufu/sdk/Library.scala new file mode 100644 index 0000000..6455532 --- /dev/null +++ b/src/main/scala/com/tribufu/sdk/Library.scala @@ -0,0 +1,7 @@ +// Copyright (c) TribuFu. All Rights Reserved. + +package com.tribufu.sdk + +class Library { + def alive(): Boolean = true +}