1.19.0 (#31)

* Fix missing sources
readingbat · Jun 27, 2021 · c0bb176 · c0bb176
1 parent 2f591de
commit c0bb176
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -54,4 +54,4 @@ depends:
 	./gradlew dependencies
 
 upgrade-wrapper:
-	./gradlew wrapper --gradle-version=7.1 --distribution-type=bin
+	./gradlew wrapper --gradle-version=6.8.3 --distribution-type=bin
diff --git a/build.gradle b/build.gradle
@@ -85,7 +85,7 @@ ext {
 allprojects {
     description = 'ReadingBat Core'
     group 'com.github.readingbat'
-    version '1.18.0'
+    version '1.19.0'
 
     apply plugin: 'application'
     apply plugin: 'java-library'
@@ -101,7 +101,7 @@ allprojects {
         maven { url = 'https://kotlin.bintray.com/ktor' }
         maven { url = 'https://kotlin.bintray.com/kotlinx' }
         maven { url = 'https://kotlin.bintray.com/kotlin-js-wrappers' }
-        maven { url = "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers" }
+        maven { url = 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers' }
         maven { url = 'https://maven-central.storage-download.googleapis.com/repos/central/data/' }
         mavenCentral()
         maven { url = 'https://jitpack.io' }
@@ -136,28 +136,47 @@ subprojects {
 //        exclude "LICENSE*"
 //    }
 
-    task sourcesJar(type: Jar) {
-        from sourceSets.main.allJava
-        archiveClassifier.set("sources")
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
     }
 
     task javadocJar(type: Jar, dependsOn: javadoc) {
-        archiveClassifier.set("javadoc")
+        classifier = 'javadoc'
         from javadoc.destinationDir
     }
 
-    publishing {
-        publications {
-            mavenAar(MavenPublication) {
-                from components.java
-                afterEvaluate {
-                    artifact javadocJar
-                    artifact sourcesJar
-                }
-            }
-        }
+    artifacts {
+        archives sourcesJar
+        //archives javadocJar
+    }
+
+    java {
+        withSourcesJar()
     }
 
+//    task sourcesJar(type: Jar) {
+//        from sourceSets.main.allJava
+//        archiveClassifier.set("sources")
+//    }
+//
+//    task javadocJar(type: Jar, dependsOn: javadoc) {
+//        archiveClassifier.set("javadoc")
+//        from javadoc.destinationDir
+//    }
+//
+//    publishing {
+//        publications {
+//            mavenAar(MavenPublication) {
+//                from components.java
+//                afterEvaluate {
+//                    artifact javadocJar
+//                    artifact sourcesJar
+//                }
+//            }
+//        }
+//    }
+
     compileKotlin {
         kotlinOptions {
             useIR = true

diff --git a/gradle.properties b/gradle.properties
@@ -24,8 +24,8 @@ logging_version=2.0.8
 pgjdbc_version=0.8.9
 postgres_version=42.2.22
 prometheus_version=0.11.0
-proxy_version=1.9.1
+proxy_version=1.10.1
 redis_version=3.6.1
 serialization_version=1.2.1
 sendgrid_version=4.7.2
-utils_version=1.14.0
+utils_version=1.15.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )