Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 7c785819 authored by Georg Veichtlbauer's avatar Georg Veichtlbauer Committed by Michael Bestas
Browse files

LatinIME: Update gradle support 

* Add back Makefiles to build native code
* Remove some assigment operator restrictions, as the code explicitly
  uses assignments in some copy constructors.

Change-Id: I0737c8561177c5c9d530a2d5122f9fd1d3765180
parent 08ff39a1

Android.mk

0 → 100644
+0 −0

Empty file added.

build.gradle

+19 −17
Original line number Diff line number Diff line
@@ -4,15 +4,16 @@ buildscript { 
        jcenter()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:3.2.0-beta03'

        classpath 'com.android.tools.build:gradle:8.1.2'

    }

}



apply plugin: 'com.android.application'



android {

    compileSdkVersion 28

    buildToolsVersion '28.0.0'

    compileSdk 34



    namespace 'com.android.inputmethod.latin'



    // Required if using classes in android.test.runner

    useLibrary 'android.test.runner'
@@ -24,8 +25,8 @@ android { 
    useLibrary 'android.test.mock'



    defaultConfig {

        minSdkVersion 21

        targetSdkVersion 28

        minSdkVersion 31

        targetSdkVersion 34

        versionName "1.0"



        applicationId 'com.android.inputmethod.latin'
@@ -72,19 +73,18 @@ android { 
        }

    }



    lintOptions {

        checkReleaseBuilds false

    }



    aaptOptions {

        noCompress 'dict'

    }



    externalNativeBuild {

        ndkBuild {

            path 'native/jni/Android.mk'

        }

    }

    androidResources {

        noCompress 'dict'

    }

    lint {

        checkReleaseBuilds false

    }

}



repositories {
@@ -96,15 +96,17 @@ repositories { 
}



dependencies {

    implementation 'androidx.legacy:legacy-support-v4:+'

    implementation 'com.google.code.findbugs:jsr305:3.0.2'

    implementation 'androidx.viewpager2:viewpager2:1.0.0'

    implementation 'com.google.android.material:material:1.9.0'

    implementation 'androidx.preference:preference:1.2.1'



    testImplementation 'junit:junit:4.12'

    androidTestImplementation "org.mockito:mockito-core:1.9.5"

    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'

    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'

    androidTestImplementation 'com.android.support.test:runner:1.0.2'

    androidTestImplementation 'com.android.support.test:rules:1.0.2'

    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'

    androidTestImplementation "com.android.support:support-annotations:27.1.1"

    androidTestImplementation 'androidx.test.ext:junit:1.1.1'

    androidTestImplementation 'androidx.test:rules:1.1.1'

    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'

    androidTestImplementation 'androidx.annotation:annotation:1.0.0'

}

gradle.properties

0 → 100644
+19 −0
Original line number Diff line number Diff line 
## For more details on how to configure your build environment visit

# http://www.gradle.org/docs/current/userguide/build_environment.html

#

# Specifies the JVM arguments used for the daemon process.

# The setting is particularly useful for tweaking memory settings.

# Default value: -Xmx1024m -XX:MaxPermSize=256m

# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -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

#Mon Jul 31 17:20:03 CEST 2023

android.defaults.buildfeatures.buildconfig=true

android.enableJetifier=true

android.nonFinalResIds=false

android.nonTransitiveRClass=false

android.useAndroidX=true

org.gradle.jvmargs=-Xmx1024M

gradle/wrapper/gradle-wrapper.jar

+9.85 KiB (62.2 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

gradle/wrapper/gradle-wrapper.properties

+3 −2
Original line number Diff line number Diff line 
#Sat Jun 23 15:45:27 PDT 2018

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip

networkTimeout=10000

validateDistributionUrl=true

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip