Modernize build: Replace CDep with direct Freetype, upgrade to Gradle 8.13/AGP 8.13.2

- Bundle Freetype 2.13.3 source directly
- Remove CDep dependency manager
- Update to Java/Kotlin target 17
- Fix JVM target compatibility
- Update README installation instructions

Author: Greg Cockroft

.gitignore

@@ -1 +1,6 @@
 /build
+/.gradle/
+/.idea/
+local.properties
+*.iml
+.cxx/

README.md

@@ -22,17 +22,13 @@ cd AndroidMath
 Installation for Android Studio
 ----------------------------------
 
-Clone this project, run CDep.
-CDep pulls in the freetype dependency.
-
+Clone this project and open in Android Studio.
 
 ```
 git clone https://github.com/gregcockroft/AndroidMath.git
-cd AndroidMath/mathdisplaylib
-./cdep 
 ```
 
-Open the project in Android Studio 
+Open the `AndroidMath` folder in Android Studio and sync Gradle. 
 
 
 Using library in your app
@@ -56,9 +52,8 @@ Add below lines to apps's build.gradle
 
 ```groovy
 dependencies {
-	        implementation 'com.github.gregcockroft:AndroidMath:ALPHA'
+	        implementation 'com.github.gregcockroft:AndroidMath:v1.1.0'
 	}
-	
 ```
 
 ```xml

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.13.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mathdisplaylib/build.gradle

@@ -16,7 +16,6 @@ android {
         multiDexEnabled true
         externalNativeBuild {
             cmake {
-                arguments "-Dcdep-dependencies_DIR=../../../.cdep/modules"
                 arguments "-DANDROID_STL=c++_shared"
             }
         }
@@ -42,6 +41,14 @@ android {
     }
     ndkVersion "28.2.13676358"
     namespace 'com.agog.mathdisplay'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 }
 
 dependencies {
@@ -61,20 +68,6 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 
-// This pulls in freetype. Dependencies are in cdep.yml
-// This only needs to run once but is being run before every build right now so that gradle command line builds will work
-
-task runcdep(type:Exec) {
-    commandLine './cdep'
-}
-
-preBuild.dependsOn(runcdep)
-
-
-// For Android Studio this needs to be run once from the command line
-//
-//  cd mathdisplaylib
-//  ./cdep
 afterEvaluate {
     publishing {
         publications {
@@ -83,7 +76,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.github.gregcockroft'
                 artifactId = 'AndroidMath'
-                version = 'v1.0.0'
+                version = 'v1.1.0'
             }
         }
     }

mathdisplaylib/src/main/cpp/CMakeLists.txt

@@ -1,21 +1,14 @@
-
-
-
 cmake_minimum_required(VERSION 3.4.1)
 
-add_library( # Sets the name of the library.
-             main
-
-             # Sets the library as a shared library.
-             SHARED
-
-             # Provides a relative path to your source file(s).
-             # Associated headers in the same location as their source
-             # file are automatically included.
-             freetype_jni.cpp
-             )
+# Build Freetype as a subdirectory (disable optional dependencies)
+set(FT_DISABLE_ZLIB ON CACHE BOOL "" FORCE)
+set(FT_DISABLE_BZIP2 ON CACHE BOOL "" FORCE)
+set(FT_DISABLE_PNG ON CACHE BOOL "" FORCE)
+set(FT_DISABLE_HARFBUZZ ON CACHE BOOL "" FORCE)
+set(FT_DISABLE_BROTLI ON CACHE BOOL "" FORCE)
+add_subdirectory(freetype)
 
-find_package(cdep-dependencies REQUIRED)
-add_all_cdep_dependencies(main)
+add_library(main SHARED freetype_jni.cpp)
 
-target_link_libraries(main log android)
+target_include_directories(main PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/freetype/include)
+target_link_libraries(main freetype log android)

mathdisplaylib/src/main/cpp/freetype/.clang-format

@@ -0,0 +1,16 @@
+BasedOnStyle: Chromium
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AlignConsecutiveMacros: true
+AlignEscapedNewlines: true
+# AlignOperands: Align
+AlignTrailingComments: true
+AlwaysBreakAfterReturnType: AllDefinitions
+BreakBeforeBraces: Allman
+ColumnLimit: 80
+DerivePointerAlignment: false
+IndentCaseLabels: false
+PointerAlignment: Left
+SpaceBeforeParens: ControlStatements
+SpacesInParentheses: true