Skip to content

Commit 28c68f6

Browse files
committed
1 parent eb955f3 commit 28c68f6

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

Android/app/build.gradle.kts

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@ plugins {
1010
skip {
1111
}
1212

13+
kotlin {
14+
compilerOptions {
15+
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(libs.versions.jvm.get().toString())
16+
}
17+
}
18+
1319
android {
1420
namespace = group as String
1521
compileSdk = libs.versions.android.sdk.compile.get().toInt()
1622
compileOptions {
1723
sourceCompatibility = JavaVersion.toVersion(libs.versions.jvm.get())
1824
targetCompatibility = JavaVersion.toVersion(libs.versions.jvm.get())
1925
}
20-
kotlinOptions {
21-
jvmTarget = libs.versions.jvm.get().toString()
22-
}
2326
packaging {
2427
jniLibs {
2528
keepDebugSymbols.add("**/*.so")
@@ -42,21 +45,28 @@ android {
4245
buildConfig = true
4346
}
4447

45-
lintOptions {
48+
lint {
4649
disable.add("Instantiatable")
4750
}
4851

4952
// default signing configuration tries to load from keystore.properties
53+
// see: https://skip.tools/docs/deployment/#export-signing
5054
signingConfigs {
5155
val keystorePropertiesFile = file("keystore.properties")
52-
if (keystorePropertiesFile.isFile) {
53-
create("release") {
56+
create("release") {
57+
if (keystorePropertiesFile.isFile) {
5458
val keystoreProperties = Properties()
5559
keystoreProperties.load(keystorePropertiesFile.inputStream())
5660
keyAlias = keystoreProperties.getProperty("keyAlias")
5761
keyPassword = keystoreProperties.getProperty("keyPassword")
5862
storeFile = file(keystoreProperties.getProperty("storeFile"))
5963
storePassword = keystoreProperties.getProperty("storePassword")
64+
} else {
65+
// when there is no keystore.properties file, fall back to signing with debug config
66+
keyAlias = signingConfigs.getByName("debug").keyAlias
67+
keyPassword = signingConfigs.getByName("debug").keyPassword
68+
storeFile = signingConfigs.getByName("debug").storeFile
69+
storePassword = signingConfigs.getByName("debug").storePassword
6070
}
6171
}
6272
}

Android/app/src/main/kotlin/Main.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ open class MainActivity: AppCompatActivity {
111111
super.onRestart()
112112
}
113113

114-
override fun onSaveInstanceState(bundle: android.os.Bundle): Unit = super.onSaveInstanceState(bundle)
114+
override fun onSaveInstanceState(outState: android.os.Bundle): Unit = super.onSaveInstanceState(outState)
115115

116116
override fun onRestoreInstanceState(bundle: android.os.Bundle) {
117117
// Usually you restore your state in onCreate(). It is possible to restore it in onRestoreInstanceState() as well, but not very common. (onRestoreInstanceState() is called after onStart(), whereas onCreate() is called before onStart().

Skip.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ PRODUCT_NAME = SkipNotes
1111
PRODUCT_BUNDLE_IDENTIFIER = org.appfair.app.SkipNotes
1212

1313
// The semantic version of the app
14-
MARKETING_VERSION = 0.8.3
14+
MARKETING_VERSION = 0.8.4
1515

1616
// The build number specifying the internal app version
17-
CURRENT_PROJECT_VERSION = 38
17+
CURRENT_PROJECT_VERSION = 41
1818

1919
// The package name for the Android entry point, referenced by the AndroidManifest.xml
2020
ANDROID_PACKAGE_NAME = skip.notes

0 commit comments

Comments
 (0)