Skip to content

Commit aa10dfa

Browse files
author
tmmvn
committed
Some rework to upgrade to current Android systems and Kotlin
1 parent b82f201 commit aa10dfa

File tree

162 files changed

+11424
-14428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+11424
-14428
lines changed

.gitignore

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,45 @@ lint/generated/
8383
lint/outputs/
8484
lint/tmp/
8585
# lint/reports/
86+
87+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
88+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
89+
90+
# User-specific stuff
91+
.idea/**/workspace.xml
92+
93+
# Covers MacOS specific files
94+
.DS_Store
95+
96+
# Covers builds
97+
*.zip
98+
99+
# BlueJ files
100+
*.ctxt
101+
102+
# Mobile Tools for Java (J2ME)
103+
.mtj.tmp/
104+
105+
# Package Files #
106+
*.jar
107+
*.war
108+
*.ear
109+
110+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
111+
hs_err_pid*
112+
113+
### Gradle ###
114+
.gradle
115+
/build/
116+
117+
# Ignore Gradle GUI config
118+
gradle-app.setting
119+
120+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
121+
!gradle-wrapper.jar
122+
123+
# Cache of project
124+
.gradletasknamecache
125+
126+
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
127+
gradle/wrapper/gradle-wrapper.properties

.idea/.gitignore

Lines changed: 0 additions & 10 deletions
This file was deleted.

.idea/aws.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.idea/codeStyles/Project.xml

Lines changed: 0 additions & 601 deletions
This file was deleted.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

app/build.gradle.kts

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
plugins {
2+
alias(libs.plugins.androidApplication)
3+
alias(libs.plugins.kotlinAndroid)
4+
alias(libs.plugins.compose.compiler)
5+
}
6+
7+
android {
8+
namespace = "com.koodipuukko"
9+
compileSdk = 34
10+
11+
defaultConfig {
12+
applicationId = "com.koodipuukko.twintilt"
13+
minSdk = 33
14+
targetSdk = 34
15+
versionCode = 1
16+
versionName = "2024.5"
17+
18+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
19+
vectorDrawables {
20+
useSupportLibrary = true
21+
}
22+
}
23+
24+
buildTypes {
25+
release {
26+
isMinifyEnabled = false
27+
proguardFiles(
28+
getDefaultProguardFile("proguard-android-optimize.txt"),
29+
"proguard-rules.pro"
30+
)
31+
}
32+
}
33+
compileOptions {
34+
sourceCompatibility = JavaVersion.VERSION_17
35+
targetCompatibility = JavaVersion.VERSION_17
36+
}
37+
kotlinOptions {
38+
jvmTarget = "17"
39+
}
40+
dependenciesInfo {
41+
includeInApk = false
42+
includeInBundle = false
43+
}
44+
buildToolsVersion = "34.0.0"
45+
ndkVersion = "26.3.11579264"
46+
buildFeatures {
47+
compose = true
48+
}
49+
composeOptions {
50+
kotlinCompilerExtensionVersion = "1.5.12"
51+
}
52+
testOptions {
53+
unitTests.isReturnDefaultValues = true
54+
}
55+
packaging {
56+
resources {
57+
excludes += "/META-INF/{AL2.0,LGPL2.1}"
58+
}
59+
}
60+
}
61+
62+
dependencies {
63+
implementation(libs.core.ktx)
64+
implementation(libs.appcompat)
65+
implementation(libs.material)
66+
implementation(libs.androidx.activity)
67+
implementation(libs.androidx.constraintlayout)
68+
implementation(libs.androidx.lifecycle.runtime.ktx)
69+
implementation(libs.androidx.activity.compose)
70+
implementation(platform(libs.androidx.compose.bom))
71+
implementation(libs.androidx.ui)
72+
implementation(libs.androidx.ui.graphics)
73+
implementation(libs.androidx.ui.tooling.preview)
74+
implementation(libs.androidx.material3)
75+
testImplementation(libs.junit)
76+
androidTestImplementation(libs.androidx.test.ext.junit)
77+
androidTestImplementation(libs.espresso.core)
78+
androidTestImplementation(platform(libs.androidx.compose.bom))
79+
androidTestImplementation(libs.androidx.ui.test.junit4)
80+
debugImplementation(libs.androidx.ui.tooling)
81+
debugImplementation(libs.androidx.ui.test.manifest)
82+
implementation(libs.androidx.material.icons.extended)
83+
implementation(kotlin("reflect"))
84+
}
File renamed without changes.

twintilt/app/src/main/AndroidManifest.xml renamed to app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.koodipuukko.twintilt"
43
android:versionCode="1"
54
android:versionName="1.0">
65
<uses-feature android:glEsVersion="0x00010000" />
7-
<application android:allowBackup="true"
6+
<application
87
android:icon="@drawable/ic_launcher"
98
android:label="@string/app_name"
109
android:theme="@style/AppTheme">
11-
<meta-data android:name="com.google.android.gms.version"
12-
android:value="@integer/google_play_services_version" />
13-
<activity android:name=".TwinTilt"
14-
android:label="@string/title_activity_twin_tilt">
10+
<activity android:name="com.koodipuukko.jeweltilt.JewelTilt"
11+
android:label="@string/title_activity_twin_tilt"
12+
android:exported="true">
1513
<intent-filter>
1614
<action android:name="android.intent.action.MAIN" />
1715
<category android:name="android.intent.category.LAUNCHER" />

0 commit comments

Comments
 (0)