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.

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

Add support for sdk 34 #26

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 uitor-android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply from: "$rootDir/build-android.gradle"
apply from: "$rootDir/build-ktlint.gradle"

android {
compileSdkVersion project["compileSdk"].toInteger()
namespace = "com.scurab.android.uitorsample"

defaultConfig {
minSdkVersion project["minSdk"].toInteger()
Expand Down
3 changes: 1 addition & 2 deletions uitor-android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.scurab.android.uitorsample">
xmlns:tools="http://schemas.android.com/tools">

<application
android:name="com.scurab.android.uitorsample.SampleApplication"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private Button createButton(String title, View.OnClickListener clickListener) {
}

private Button createThemedButton(String title, View.OnClickListener clickListener) {
Button button = new Button(new ContextThemeWrapper(requireActivity(), R.style.Theme_AppCompat_Light));
Button button = new Button(new ContextThemeWrapper(requireActivity(), androidx.appcompat.R.style.Theme_AppCompat_Light));
button.setText(title);
button.setOnClickListener(clickListener);
return button;
Expand Down Expand Up @@ -101,7 +101,7 @@ protected void onShowAlertDialog() {
}

protected void onShowDatePickerDialog() {
ContextThemeWrapper themeWrapper = new ContextThemeWrapper(getActivity(), R.style.Theme_AppCompat);
ContextThemeWrapper themeWrapper = new ContextThemeWrapper(getActivity(), androidx.appcompat.R.style.Theme_AppCompat_Light);
new DatePickerDialog(themeWrapper, null, 2012, 3, 3).show();
}

Expand Down
8 changes: 5 additions & 3 deletions uitor-android/build-android.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
android {
compileSdkVersion project["compileSdk"].toInteger()
compileSdk project["compileSdk"].toInteger()

buildFeatures.buildConfig true

defaultConfig {
minSdkVersion minSdk
Expand All @@ -21,7 +23,7 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
}
2 changes: 1 addition & 1 deletion uitor-android/build-versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

ext {
minSdk = 14
compileSdk = 31
compileSdk = 34
targetSdk = compileSdk
gson = "2.9.0"
jackson = "2.12.7"
Expand Down
11 changes: 4 additions & 7 deletions uitor-android/buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@ apply plugin: 'java-library'
apply plugin: 'kotlin'
apply from: '../build-versions.gradle'

sourceCompatibility = "8"
targetCompatibility = "8"

buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
}
}

Expand All @@ -23,16 +20,16 @@ repositories {

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}
dependencies {
def kotlinVersion = "1.7.10"
def kotlinVersion = "1.9.23"
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
implementation "com.squareup:kotlinpoet:$kotlin_poet"
Expand Down
8 changes: 4 additions & 4 deletions uitor-android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
# Default value: -Xmx10248m -XX:MaxPermSize=256m
android.enableJetifier=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
org.gradle.parallel=true
releaseVersion=2.1.2
androidGradlePlugin=7.2.1
kotlinVersion=1.7.10
releaseVersion=2.2.0
androidGradlePlugin=8.5.0
kotlinVersion=1.9.23
dokkaVersion=1.7.0
ktLintPlugin=10.3.0
ktLint=0.45.2
Binary file modified uitor-android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions uitor-android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sun May 31 20:56:32 BST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
Loading