diff --git a/android/build.gradle b/android/build.gradle index 1a434db..ed7b61d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'com.android.library' - id 'kotlin-android' + id "com.android.library" + id "kotlin-android" } android { @@ -20,7 +20,7 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" } } @@ -30,18 +30,18 @@ android { } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = "1.8" } } dependencies { - implementation files('libs/TribuFu.jar') + 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' + 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/library/build.gradle.kts b/library/build.gradle similarity index 51% rename from library/build.gradle.kts rename to library/build.gradle index a311b1e..2448e41 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle @@ -1,9 +1,9 @@ plugins { // Apply the scala Plugin to add support for Scala. - scala + id "scala" // Apply the java-library plugin for API and implementation separation. - `java-library` + id "java-library" } group = "com.tribufu.sdk" @@ -16,25 +16,30 @@ repositories { dependencies { // Use Scala 2.13 in our library project - implementation("org.scala-lang:scala-library:2.13.3") + 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") + 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") + 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") + 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") + api "org.apache.commons:commons-math3:3.6.1" } -tasks.jar { +tasks.named("jar") { manifest { - attributes(mapOf("Implementation-Title" to project.name, "Implementation-Version" to project.version)) + attributes("Implementation-Title": project.name, "Implementation-Version": project.version) } } + +java { + withSourcesJar() + withJavadocJar() +} diff --git a/settings.gradle.kts b/settings.gradle similarity index 56% rename from settings.gradle.kts rename to settings.gradle index ff71db1..0fc0ebb 100644 --- a/settings.gradle.kts +++ b/settings.gradle @@ -1,3 +1,3 @@ include("library") include("android") -rootProject.name = "TribuFu" +rootProject.name = "DevKit"