aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2021-08-29 17:44:38 -0700
committerAllan Wang <me@allanwang.ca>2021-08-29 17:44:38 -0700
commit6c1130353572f79db7feeae1ad955464a350b9ac (patch)
tree3686c5acbc59696929182afa895ac341cdb868fa
parentbf55dbf9b46cd8826987ee6e556307e24f3d46cc (diff)
downloadfrost-6c1130353572f79db7feeae1ad955464a350b9ac.tar.gz
frost-6c1130353572f79db7feeae1ad955464a350b9ac.tar.bz2
frost-6c1130353572f79db7feeae1ad955464a350b9ac.zip
Update versions
-rw-r--r--.idea/misc.xml5
-rw-r--r--app/build.gradle10
-rw-r--r--gradle.properties2
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
4 files changed, 10 insertions, 9 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c08f858e..88df0bd7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
</option>
<option name="myNotNulls">
<value>
- <list size="13">
+ <list size="14">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@@ -39,11 +39,12 @@
<item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
<item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
<item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+ <item index="13" class="java.lang.String" itemvalue="lombok.NonNull" />
</list>
</value>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 1046d52f..1249355d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'com.gladed.androidgitversion'
buildscript {
repositories {
- jcenter()
+ mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
@@ -184,12 +184,12 @@ android {
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility kau.Versions.java
+ targetCompatibility kau.Versions.java
}
kotlinOptions {
- jvmTarget = JavaVersion.VERSION_1_8.toString()
+ jvmTarget = kau.Versions.java.toString()
}
testOptions.unitTests {
@@ -230,7 +230,7 @@ preBuild.dependsOn(frostWebGen)
repositories {
google()
- jcenter()
+ mavenCentral()
maven { url "https://jitpack.io" }
}
diff --git a/gradle.properties b/gradle.properties
index f45f13d2..2c684051 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ org.gradle.daemon = true
APP_ID=Frost
APP_GROUP=com.pitchedapps
-KAU=6492c0c
+KAU=b978170
android.useAndroidX=true
android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 80cf08e7..29e41345 100644
--- 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-6.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists