Prepare for Release 1.2.2

cashapp · Jan 23, 2020 · 2231e1d · 2231e1d
1 parent 34f74eb
commit 2231e1d
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 37 deletions.
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -1,4 +1,4 @@
-name: Publish the snapshot version
+name: Publish a release
 
 on:
   push:
@@ -14,13 +14,14 @@ jobs:
     steps:
     - name: Checkout the repo
       uses: actions/checkout@v1
-    - name: Publish the snapshot artifacts
+    - name: Publish the macOS artifacts
       env:
         ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME }}
         ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD }}
         ORG_GRADLE_PROJECT_SQLDELIGHT_BUGSNAG_KEY: ${{ secrets.ORG_GRADLE_PROJECT_SQLDELIGHT_BUGSNAG_KEY }}
         ORG_GRADLE_PROJECT_intellijPublishToken: ${{ secrets.ORG_GRADLE_PROJECT_intellijPublishToken }}
-      run: ./gradlew uploadArchives publish publishPlugin --no-daemon
+        ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_signingKey }}
+      run: ./gradlew uploadArchives publish --no-daemon
 
   windows-build:
     runs-on: windows-latest
@@ -32,7 +33,8 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME }}
           ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_signingKey }}
         run: ./gradlew publishMingwPublicationToMavenRepository
 
 env:
-  GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=true -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
+  GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=false -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+Version 1.2.1 *(2020-01-22)*
+----------------------------
+
+* New: [Runtime] Support for Windows (mingW), tvOS, watchOS, and macOS architectures.
+* Fix: [Compiler] Return type of sum() should be nullable
+* Fix: [Paging] Pass Transacter into QueryDataSourceFactory to avoid race conditions
+* Fix: [IntelliJ Plugin] Dont search through dependencies when looking for a files package name.
+* Fix: [Gradle] #862 Change validator logs in Gradle to debug level.
+* Enhancement: [Gradle] Convert GenerateSchemaTask to use Gradle worker
+* Note: sqldelight-runtime artifact renamed to runtime.
+
+
 Version 1.2.1 *(2019-12-11)*
 ----------------------------
 

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ From this SQLDelight will generate a `Database` Kotlin class with an associated
 #### Android
 ```groovy
 dependencies {
-  implementation "com.squareup.sqldelight:android-driver:1.2.1"
+  implementation "com.squareup.sqldelight:android-driver:1.2.2"
 }
 ```
 ```kotlin
@@ -38,7 +38,7 @@ val driver: SqlDriver = AndroidSqliteDriver(Database.Schema, context, "test.db")
 #### iOS, or Windows (Using Kotlin/Native)
 ```groovy
 dependencies {
-  implementation "com.squareup.sqldelight:native-driver:1.2.1"
+  implementation "com.squareup.sqldelight:native-driver:1.2.2"
 }
 
 // You'll also need to have SQLite linked via -lsqlite3 during compilation.
@@ -50,7 +50,7 @@ val driver: SqlDriver = NativeSqliteDriver(Database.Schema, "test.db")
 #### JVM
 ```groovy
 dependencies {
-  implementation "com.squareup.sqldelight:sqlite-driver:1.2.1"
+  implementation "com.squareup.sqldelight:sqlite-driver:1.2.2"
 }
 ```
 ```kotlin
@@ -103,7 +103,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.squareup.sqldelight:gradle-plugin:1.2.1'
+    classpath 'com.squareup.sqldelight:gradle-plugin:1.2.2'
   }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.squareup.sqldelight
-VERSION_NAME=1.3.0-SNAPSHOT
+VERSION_NAME=1.2.2
 
 POM_URL=https://github.com/square/sqldelight/
 POM_SCM_URL=https://github.com/square/sqldelight/

diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle
@@ -72,6 +72,10 @@ def getRepositoryPassword() {
   return hasProperty('SONATYPE_NEXUS_PASSWORD') ? SONATYPE_NEXUS_PASSWORD : ""
 }
 
+def getGpgKey() {
+  return hasProperty('signingKey') ? signingKey : ""
+}
+
 task emptySourcesJar(type: Jar) {
   classifier = 'sources'
 }
@@ -82,8 +86,11 @@ task javadocsJar(type: Jar, dependsOn: dokka) {
 }
 
 signing {
-  required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
-  sign(publishing.publications)
+  required { isReleaseBuild() }
+
+  def signingKey = getGpgKey()
+  useInMemoryPgpKeys(signingKey, "")
+  sign publishing.publications
 }
 
 publishing {

diff --git a/gradle/gradle-mvn-push.gradle b/gradle/gradle-mvn-push.gradle
@@ -46,6 +46,10 @@ def getPluginToken() {
   return hasProperty('intellijPublishToken') ? intellijPublishToken : ""
 }
 
+def getGpgKey() {
+  return hasProperty('signingKey') ? signingKey : ""
+}
+
 def configurePom(pom) {
   pom.groupId = GROUP
   pom.artifactId = POM_ARTIFACT_ID
@@ -111,7 +115,10 @@ afterEvaluate { project ->
   }
 
   signing {
-    required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
+    required { isReleaseBuild() }
+
+    def signingKey = getGpgKey()
+    useInMemoryPgpKeys(signingKey, "")
     sign configurations.archives
   }
 

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-5.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# 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"`
@@ -154,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        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" ;;
+        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" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # 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"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/settings.gradle b/settings.gradle
@@ -16,6 +16,3 @@ include ':sqldelight-gradle-plugin'
 include ':sqldelight-idea-plugin'
 include ':sqlite-migrations'
 include ':test-util'
-
-enableFeaturePreview('GRADLE_METADATA')
-enableFeaturePreview('STABLE_PUBLISHING')