From dc409d14c26a9cb6be4eecfb59e56f37207572c8 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Thu, 6 Jun 2019 16:23:22 -0400
Subject: Enhancement/whatsnew (#1434)

* Use kts for settings

* Update whatsnew automatically

* Remove changelog length check
---
 .idea/codeStyles/Project.xml             | 25 -------------------------
 .idea/encodings.xml                      |  4 ++++
 app/src/main/play/en-US/whatsnew         |  9 ++++++++-
 build.gradle                             | 18 ++++++++++++++++--
 gradle.properties                        |  4 ++--
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 settings.gradle                          |  1 -
 settings.gradle.kts                      |  1 +
 8 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 .idea/encodings.xml
 delete mode 100644 settings.gradle
 create mode 100644 settings.gradle.kts

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0290b2f8..be6976dc 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -13,31 +13,6 @@
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
     <XML>
       <option name="XML_KEEP_LINE_BREAKS" value="false" />
       <option name="XML_ALIGN_ATTRIBUTES" value="false" />
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000..15a15b21
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/app/src/main/play/en-US/whatsnew b/app/src/main/play/en-US/whatsnew
index 9f440f8b..3c3943fb 100644
--- a/app/src/main/play/en-US/whatsnew
+++ b/app/src/main/play/en-US/whatsnew
@@ -1 +1,8 @@
-A full changelog is available in the app, or at https://github.com/AllanWang/Frost-for-Facebook/blob/dev/docs/Changelog.md.
\ No newline at end of file
+v2.3.0
+
+* Converted internals of Facebook data storage; auto migration will only work from 2.2.x to 2.3.x
+* Added notification widget
+* Update theme
+* Update translations
+* Add fingerprint unlock screen
+* Fix messenger redirect
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 33031d0b..7ccde02f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,14 +20,28 @@ buildscript {
     wrapper.setDistributionType(Wrapper.DistributionType.ALL)
 }
 
-apply plugin: 'ca.allanwang.kau'
+apply plugin: "ca.allanwang.kau"
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
 task generateChangelogMd() {
-    kauChangelog.generate("$project.rootDir/app/src/main/res/xml/frost_changelog.xml")
+    def changelog = kauChangelog.generate("${project.rootDir}/app/src/main/res/xml/frost_changelog.xml")
+    // If we have no changelog, something is wrong
+    def entry = changelog[0]
+    def whatsNewFile = new File("${project.rootDir}/app/src/main/play/en-US/whatsnew")
+    if (!whatsNewFile.exists()) {
+        // Throw exceptions so that moving this file will require us to update the script
+        throw new RuntimeException("Whatsnew file not found")
+    }
+    whatsNewFile.withWriter { writer ->
+        writer.write(entry.version)
+        writer.write("\n")
+        entry.items.each {
+            writer.write("\n* ${it}")
+        }
+    }
 }
 
 task fullRelease(type: GradleBuild) {
diff --git a/gradle.properties b/gradle.properties
index c64655c4..b32725c3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,11 +16,11 @@ org.gradle.daemon = true
 APP_ID=Frost
 APP_GROUP=com.pitchedapps
 
-KAU=4.0.0
+KAU=c6a5b4e
 KOTLIN=1.3.31
 
 # https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
-ANDROID_GRADLE=3.3.2
+ANDROID_GRADLE=3.4.1
 
 # https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md
 SPOTLESS=3.21.1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 953390dc..ce46b811 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Dec 23 17:28:36 EST 2018
+#Sat Jun 01 20:58:39 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 9d495b34..00000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app'
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 00000000..8a109a87
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1 @@
+include(":app")
\ No newline at end of file
-- 
cgit v1.2.3