Compression ignition and spark ignition are merging.
Newest mazda skyactiv gas engine: direct injection, turbo, 14:1CR
Newest Mazda Skyactive Diesel engine: direct injection, turbo, 14.5:1CR.
Gas engines are trying to use the best features of Diesel (high CR, turbo, DI), while keeping common fuel availability.
Diesel engines are adopting gas engine tech(EFI, catalysts...) and trying to lower CR as much as possible (reduced NOx formation) while maintaining cold start viability.
Ultimately, the true Diesel will die (like the Wankel did recently) due to ever more stringent regs which will make it cost prohibitive to produce an EPA legal engine. Big trucks will hang on longer because the several thousand dollar upfront penalty of purchasing a Diesel can be amortized over 500,000mile lifespan of operating at 10% better MPG. That math doesn't work for a cheap car like my Golf TDI.
Hopefully battery tech will continue to improve and electric will be able to replace combustion cars soon. I would have a Leaf, but we are a 1 car household and DW likes her old Golf with 800mile range.