Skip to content

Commit f984fed

Browse files
committed
exampes update
1 parent 30e08b4 commit f984fed

File tree

31 files changed

+2972
-534
lines changed

31 files changed

+2972
-534
lines changed

Diff for: buildSrc/.gitignore

-2
This file was deleted.

Diff for: buildSrc/build.gradle.kts

-7
This file was deleted.

Diff for: buildSrc/src/main/kotlin/Libs.kt

-184
This file was deleted.

Diff for: buildSrc/src/main/kotlin/Plugins.kt

-6
This file was deleted.

Diff for: buildSrc/src/main/kotlin/Versions.kt

-61
This file was deleted.

Diff for: examples/build.gradle.kts

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
plugins {
2+
id("convention.common")
3+
}
4+
5+
gradleEnterprise {
6+
buildScan {
7+
termsOfServiceUrl = "https://gradle.com/terms-of-service"
8+
termsOfServiceAgree = "yes"
9+
}
10+
}
11+
12+
// TODO(COMPOSITE) Remove once KMP properly supports composite builds
13+
allprojects {
14+
configurations.all {
15+
resolutionStrategy {
16+
dependencySubstitution {
17+
val reduxVersion = "+"
18+
substitute(module("org.reduxkotlin:redux-kotlin"))
19+
.using(module("org.reduxkotlin:redux-kotlin:$reduxVersion"))
20+
substitute(module("org.reduxkotlin:redux-kotlin-threadsafe"))
21+
.using(module("org.reduxkotlin:redux-kotlin-threadsafe:$reduxVersion"))
22+
}
23+
}
24+
}
25+
}

Diff for: examples/counter/android/build.gradle.kts

+14-20
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1+
@file:Suppress("UnstableApiUsage")
2+
13
plugins {
4+
id("convention.control")
25
id("com.android.application")
36
kotlin("android")
4-
// kotlin("android.extensions")
57
kotlin("kapt")
68
}
79

810
android {
9-
compileSdkVersion(29)
11+
namespace = "org.reduxkotlin.example.counter"
12+
compileSdk = 33
1013
defaultConfig {
11-
applicationId = "org.reduxkotlin.example.counter"
12-
minSdkVersion(26)
13-
targetSdkVersion(29)
14+
applicationId = "org.reduxkotlin.example.todos"
15+
minSdk = 26
16+
targetSdk = 33
1417
versionCode = 1
1518
versionName = "1.0"
1619
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -19,25 +22,16 @@ android {
1922
sourceCompatibility = JavaVersion.VERSION_1_8
2023
targetCompatibility = JavaVersion.VERSION_1_8
2124
}
22-
buildTypes {
23-
getByName("release") {
24-
isMinifyEnabled = false
25-
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
26-
}
27-
getByName("debug") {
28-
// MPP libraries don't currently get this resolution automatically
29-
matchingFallbacks = listOf("release")
30-
}
25+
buildFeatures {
26+
viewBinding = true
3127
}
3228
packagingOptions {
33-
exclude("META-INF/*.kotlin_module")
29+
resources.excludes.add("META-INF/*.kotlin_module")
3430
}
3531
}
3632

3733
dependencies {
38-
implementation(Libs.kotlin_stdlib_jdk8)
39-
implementation(Libs.appcompat)
40-
41-
implementation(project(":examples:counter:common"))
42-
implementation(project(":redux-kotlin-threadsafe"))
34+
implementation("androidx.appcompat:appcompat:_")
35+
implementation(project(":counter:common"))
36+
implementation("org.reduxkotlin:redux-kotlin-threadsafe")
4337
}

Diff for: examples/counter/android/gradle.properties

-1
This file was deleted.

Diff for: examples/counter/android/src/main/AndroidManifest.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="org.reduxkotlin.example.counter">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
6-
android:allowBackup="true"
7-
android:icon="@mipmap/ic_launcher"
8-
android:label="@string/app_name"
9-
android:roundIcon="@mipmap/ic_launcher_round"
10-
android:supportsRtl="true"
11-
android:theme="@style/CounterAppTheme">
12-
<activity
13-
android:name=".MainActivity"
5+
android:allowBackup="true"
6+
android:icon="@mipmap/ic_launcher"
147
android:label="@string/app_name"
8+
android:roundIcon="@mipmap/ic_launcher_round"
9+
android:supportsRtl="true"
1510
android:theme="@style/CounterAppTheme">
11+
<activity
12+
android:name=".MainActivity"
13+
android:exported="true"
14+
android:label="@string/app_name"
15+
android:theme="@style/CounterAppTheme">
1616
<intent-filter>
17-
<action android:name="android.intent.action.MAIN" />
17+
<action android:name="android.intent.action.MAIN"/>
1818

19-
<category android:name="android.intent.category.LAUNCHER" />
19+
<category android:name="android.intent.category.LAUNCHER"/>
2020
</intent-filter>
2121
</activity>
2222
</application>

0 commit comments

Comments
 (0)