Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Update Android sample #720

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

✨ Update Android sample #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ on:
description: "Enable sample-android"
required: true
type: boolean
default: false
default: true
run-on:
type: choice
description: "Where to run this workflow"
Expand Down
10 changes: 7 additions & 3 deletions sample-android/app/android.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
android {
compileSdkVersion findProperty("compileSdkVersion") as Integer
namespace "com.raywenderlich.android.smallvictories"
compileSdk findProperty("compileSdkVersion") as Integer
defaultConfig {
applicationId findProperty("applicationId")
minSdkVersion findProperty("minSdkVersion") as Integer
Expand All @@ -10,7 +11,10 @@ android {
vectorDrawables.useSupportLibrary = true
}
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility 17
targetCompatibility 17
}
buildFeatures {
viewBinding true
}
}
5 changes: 2 additions & 3 deletions sample-android/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("com.android.application")
kotlin("android")
kotlin("android.extensions")
id("gradle.site")
}

apply(from = "android.gradle")

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "17"
}

dependencies {
implementation(platform(Firebase.bom))
implementation(Firebase.authentication)
implementation("com.google.firebase:firebase-analytics")
implementation(Firebase.analytics)


implementation(Kotlin.stdlib.jdk7)
Expand Down
3 changes: 1 addition & 2 deletions sample-android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.raywenderlich.android.smallvictories">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down
6 changes: 3 additions & 3 deletions sample-android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ android.useAndroidX=true
android.enableJetifier=false

# Allows to have ./app/android.gradle as generic as possible
compileSdkVersion=28
compileSdkVersion=34
applicationId=com.raywenderlich.android.smallvictories
targetSdkVersion=28
minSdkVersion=19
targetSdkVersion=34
minSdkVersion=26
versionCode=2
versionName=2.0

Expand Down
2 changes: 1 addition & 1 deletion sample-android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading